Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Feb 2013 23:45:29 +0000 (15:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Feb 2013 23:45:29 +0000 (15:45 -0800)
commitf6d43b93bd07cf3e430f426ee8f1330cb8d5d8c9
tree284d1fc1e6954b747eb3c68dcb77a704e9a6b579
parentc69d0a15d240a854f6d620ac7d5238a41883a920
parent446d64e3e1154806092ac27de198dff1225797d9
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull security subsystem fixes from James Morris:
 "From Mimi:

    Both of these patches are bug fixes for patches, which were
    upstreamed in this open window.  The first patch addresses a merge
    issue.  The second patch addresses a CONFIG_BLOCK dependency."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  block: fix part_pack_uuid() build error
  ima: "remove enforce checking duplication" merge fix