tree 67be4d125ad6abe2eeee00eab12e0fc8f03fa099
parent 7cb9cf0224efd6d41b2bdd9bfb412b42aa4281f8
parent d26e1936227b538a1691b978566ef269aef10853
author Linus Torvalds <torvalds@linux-foundation.org> 1349611641 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1349611641 +0900

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