diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 00:45:29 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 00:45:29 +0100 |
commit | f6d43b93bd07cf3e430f426ee8f1330cb8d5d8c9 (patch) | |
tree | 284d1fc1e6954b747eb3c68dcb77a704e9a6b579 /arch/ia64 | |
parent | Merge tag 'ktest-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/roste... (diff) | |
parent | block: fix part_pack_uuid() build error (diff) | |
download | linux-f6d43b93bd07cf3e430f426ee8f1330cb8d5d8c9.tar.xz linux-f6d43b93bd07cf3e430f426ee8f1330cb8d5d8c9.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/ia64')
0 files changed, 0 insertions, 0 deletions