Linus Torvalds 1aaf2e5913 Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, intel_txt: clean up the impact on generic code, unbreak non-x86 x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE x86, intel_txt: Fix typos in Kconfig help x86, intel_txt: Factor out the code for S3 setup x86, intel_txt: tboot.c needs <asm/fixmap.h> intel_txt: Force IOMMU on for Intel TXT launch x86, intel_txt: Intel TXT Sx shutdown support x86, intel_txt: Intel TXT reboot/halt shutdown support x86, intel_txt: Intel TXT boot support		2009-09-15 09:19:20 -07:00
..
integrity/ima	IMA: update ima_counts_put	2009-09-07 11:54:58 +10:00
keys	KEYS: Fix garbage collector	2009-09-15 09:11:02 +10:00
selinux	SELinux: flush the avc before disabling SELinux	2009-09-14 12:34:11 +10:00
smack	sysfs: Add labeling support for sysfs	2009-09-10 10:11:29 +10:00
tomoyo	KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]	2009-09-02 21:29:22 +10:00
Kconfig	Merge commit 'v2.6.31-rc8' into x86/txt	2009-09-02 08:17:56 +02:00
Makefile	Security/SELinux: seperate lsm specific mmap_min_addr	2009-08-17 15:09:11 +10:00
capability.c	LSM/SELinux: inode_{get,set,notify}secctx hooks to access LSM security context information.	2009-09-10 10:11:24 +10:00
commoncap.c	Security/SELinux: seperate lsm specific mmap_min_addr	2009-08-17 15:09:11 +10:00
device_cgroup.c	devcgroup: skip superfluous checks when found the DEV_ALL elem	2009-06-18 13:03:47 -07:00
inode.c	…
lsm_audit.c	SELinux: Convert avc_audit to use lsm_audit.h	2009-08-17 08:37:18 +10:00
min_addr.c	Security/SELinux: seperate lsm specific mmap_min_addr	2009-08-17 15:09:11 +10:00
root_plug.c	…
security.c	LSM/SELinux: inode_{get,set,notify}secctx hooks to access LSM security context information.	2009-09-10 10:11:24 +10:00