review.tizen.org Git - kernel/kernel-generic.git/commit

author	James Morris <jmorris@namei.org>
	Thu, 6 May 2010 00:56:07 +0000 (10:56 +1000)
committer	James Morris <jmorris@namei.org>
	Thu, 6 May 2010 00:56:07 +0000 (10:56 +1000)
commit	0ffbe2699cda6afbe08501098dff8a8c2fe6ae09
tree	81b1a2305d16c873371b65c5a863c0268036cefe	tree \| snapshot
parent	4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6	commit \| diff
parent	7ebd467551ed6ae200d7835a84bbda0dcadaa511	commit \| diff

Merge branch 'master' into next

25 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
drivers/char/tpm/tpm.c	diff1 \|	diff2 \|	blob \| history
drivers/char/tpm/tpm_tis.c	diff1 \|	diff2 \|	blob \| history
include/linux/security.h	diff1 \|	diff2 \|	blob \| history
kernel/cred.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
security/device_cgroup.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_audit.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_crypto.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_fs.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_iint.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_init.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_main.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_policy.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_queue.c	diff1 \|	diff2 \|	blob \| history
security/keys/keyring.c	diff1 \|	diff2 \|	blob \| history
security/keys/proc.c	diff1 \|	diff2 \|	blob \| history
security/lsm_audit.c	diff1 \|	diff2 \|	blob \| history
security/selinux/netlabel.c	diff1 \|	diff2 \|	blob \| history
security/selinux/netlink.c	diff1 \|	diff2 \|	blob \| history
security/smack/smack_lsm.c	diff1 \|	diff2 \|	blob \| history
security/tomoyo/common.c	diff1 \|	diff2 \|	blob \| history
security/tomoyo/domain.c	diff1 \|	diff2 \|	blob \| history
security/tomoyo/file.c	diff1 \|	diff2 \|	blob \| history
security/tomoyo/realpath.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
drivers/char/tpm/tpm.c	diff1 \|	diff2 \|	blob \| history
drivers/char/tpm/tpm_tis.c	diff1 \|	diff2 \|	blob \| history
include/linux/security.h	diff1 \|	diff2 \|	blob \| history
kernel/cred.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
security/device_cgroup.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_audit.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_crypto.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_fs.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_iint.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_init.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_main.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_policy.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_queue.c	diff1 \|	diff2 \|	blob \| history
security/keys/keyring.c	diff1 \|	diff2 \|	blob \| history
security/keys/proc.c	diff1 \|	diff2 \|	blob \| history
security/lsm_audit.c	diff1 \|	diff2 \|	blob \| history
security/selinux/netlabel.c	diff1 \|	diff2 \|	blob \| history
security/selinux/netlink.c	diff1 \|	diff2 \|	blob \| history
security/smack/smack_lsm.c	diff1 \|	diff2 \|	blob \| history
security/tomoyo/common.c	diff1 \|	diff2 \|	blob \| history
security/tomoyo/domain.c	diff1 \|	diff2 \|	blob \| history
security/tomoyo/file.c	diff1 \|	diff2 \|	blob \| history
security/tomoyo/realpath.c	diff1 \|	diff2 \|	blob \| history