From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 04:13:33 +0000 (+1000)
Subject: Merge remote-tracking branch 'security/next'
X-Git-Tag: next-20130628~46
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=87e3037fbda3d65e6516affa5616da178c3b9d36;p=karo-tx-linux.git

Merge remote-tracking branch 'security/next'

Conflicts:
	Documentation/kernel-parameters.txt
---

87e3037fbda3d65e6516affa5616da178c3b9d36
diff --cc Documentation/kernel-parameters.txt
index bb0ab6443a7d,cb5daa1cd605..fe03870a0639
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1158,8 -1153,11 +1153,13 @@@ bytes respectively. Such letter suffixe
  	inport.irq=	[HW] Inport (ATI XL and Microsoft) busmouse driver
  			Format: <irq>
  
 +	int_pln_enable  [x86] Enable power limit notification interrupt
 +
+ 	integrity_audit=[IMA]
+ 			Format: { "0" | "1" }
+ 			0 -- basic integrity auditing messages. (Default)
+ 			1 -- additional integrity auditing messages.
+ 
  	intel_iommu=	[DMAR] Intel IOMMU driver (DMAR) option
  		on
  			Enable intel iommu driver.