Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next

diff --cc security/lsm_audit.c
Simple merge

diff --cc security/selinux/avc.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge

diff --cc security/selinux/include/avc.h
index 5973c327c54e712edba1034808defd01afa8a8a0,db12ff14277b24e4222fc8415aec2c62f9cfcb60..0999df03af8bff2fe54c084e7459ed19da5a20c2
--- 1/security/selinux/include/avc.h
--- 2/security/selinux/include/avc.h
+++ b/security/selinux/include/avc.h
@@@ -151,11 -151,11 +152,15 @@@ int avc_has_perm_noaudit(u32 ssid, u32 
  int avc_has_perm(u32 ssid, u32 tsid,
                 u16 tclass, u32 requested,
                 struct common_audit_data *auditdata);
 +int avc_has_perm_flags(u32 ssid, u32 tsid,
 +                     u16 tclass, u32 requested,
 +                     struct common_audit_data *auditdata,
 +                     int flags);
  
+ int avc_has_extended_perms(u32 ssid, u32 tsid, u16 tclass, u32 requested,
+               u8 driver, u8 perm, struct common_audit_data *ad);
+ 
+ 
  u32 avc_policy_seqno(void);
  
  #define AVC_CALLBACK_GRANT            1