Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Thu, 6 May 2010 00:56:07 +0000 (10:56 +1000)
committerJames Morris <jmorris@namei.org>
Thu, 6 May 2010 00:56:07 +0000 (10:56 +1000)
commit0ffbe2699cda6afbe08501098dff8a8c2fe6ae09
tree81b1a2305d16c873371b65c5a863c0268036cefe
parent4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6
parent7ebd467551ed6ae200d7835a84bbda0dcadaa511
Merge branch 'master' into next
25 files changed:
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