Merge branch 'master' into next
James Morris [Thu, 6 May 2010 00:56:07 +0000 (10:56 +1000)]
25 files changed:
1  2 
Documentation/kernel-parameters.txt
drivers/char/tpm/tpm.c
drivers/char/tpm/tpm_tis.c
include/linux/security.h
kernel/cred.c
kernel/sys.c
security/device_cgroup.c
security/integrity/ima/ima_audit.c
security/integrity/ima/ima_crypto.c
security/integrity/ima/ima_fs.c
security/integrity/ima/ima_iint.c
security/integrity/ima/ima_init.c
security/integrity/ima/ima_main.c
security/integrity/ima/ima_policy.c
security/integrity/ima/ima_queue.c
security/keys/keyring.c
security/keys/proc.c
security/lsm_audit.c
security/selinux/netlabel.c
security/selinux/netlink.c
security/smack/smack_lsm.c
security/tomoyo/common.c
security/tomoyo/domain.c
security/tomoyo/file.c
security/tomoyo/realpath.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/cred.c
Simple merge
diff --cc kernel/sys.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
   */
  #include <linux/init.h>
  #include <linux/types.h>
+ #include <linux/slab.h>
  #include <linux/stddef.h>
  #include <linux/kernel.h>
 -#include <linux/list.h>
  #include <linux/skbuff.h>
  #include <linux/netlink.h>
  #include <linux/selinux_netlink.h>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge