diff options
author | Linus Torvalds | 2012-10-07 14:07:21 +0200 |
---|---|---|
committer | Linus Torvalds | 2012-10-07 14:07:21 +0200 |
commit | 638c87a91666df1f16866badee862ce38bf31e4a (patch) | |
tree | 67be4d125ad6abe2eeee00eab12e0fc8f03fa099 /arch/arm/mach-sa1100/include | |
parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg... (diff) | |
parent | ima: fix bug in argument order (diff) | |
download | kernel-qcow2-linux-638c87a91666df1f16866badee862ce38bf31e4a.tar.gz kernel-qcow2-linux-638c87a91666df1f16866badee862ce38bf31e4a.tar.xz kernel-qcow2-linux-638c87a91666df1f16866badee862ce38bf31e4a.zip |
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/arm/mach-sa1100/include')
0 files changed, 0 insertions, 0 deletions