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: omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=638c87a91666df1f16866badee862ce38bf31e4a

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