Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Oct 2012 12:07:21 +0000 (21:07 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Oct 2012 12:07:21 +0000 (21:07 +0900)
commit638c87a91666df1f16866badee862ce38bf31e4a
tree67be4d125ad6abe2eeee00eab12e0fc8f03fa099
parent7cb9cf0224efd6d41b2bdd9bfb412b42aa4281f8
parentd26e1936227b538a1691b978566ef269aef10853
Merge branch 'for-linus' of git://git./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