]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd9f8e3b3fce2081d7277d53ba47c4252be30dc40
tree67be4d125ad6abe2eeee00eab12e0fc8f03fa099
parentffc91e2320b18b835ae7fc2b4d56f6df26f16127
parent3a865717254ec2bf31b41d28293ea1ff39e7fd21
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