diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 12:07:21 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 12:07:21 (GMT) |
commit | 638c87a91666df1f16866badee862ce38bf31e4a (patch) | |
tree | 67be4d125ad6abe2eeee00eab12e0fc8f03fa099 /arch/microblaze/include/asm/pci.h | |
parent | 7cb9cf0224efd6d41b2bdd9bfb412b42aa4281f8 (diff) | |
parent | d26e1936227b538a1691b978566ef269aef10853 (diff) | |
download | linux-fsl-qoriq-638c87a91666df1f16866badee862ce38bf31e4a.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull IMA bugfix (security subsystem) from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
ima: fix bug in argument order
Diffstat (limited to 'arch/microblaze/include/asm/pci.h')
0 files changed, 0 insertions, 0 deletions