From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Oct 2012 12:07:21 +0000 (+0900)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: MMI-PSA29.97-13-9~15821
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=638c87a91666df1f16866badee862ce38bf31e4a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

638c87a91666df1f16866badee862ce38bf31e4a