Merge remote-tracking branch 'security/next'

Conflicts:
	Documentation/kernel-parameters.txt

diff --cc Documentation/kernel-parameters.txt
index bb0ab6443a7d066c66400ac73b9e2d6b1841472c,cb5daa1cd605506c7c964f5328cc200957073fa1..fe03870a06390df4607a1034a9b3ed23e34a3e0c
--- 1/Documentation/kernel-parameters.txt
--- 2/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.

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/security.h
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge