You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		16 years ago
..
integrity/ima	IMA: update ima_counts_put	16 years ago
keys	KEYS: Fix garbage collector	16 years ago
selinux	SELinux: flush the avc before disabling SELinux	16 years ago
smack	sysfs: Add labeling support for sysfs	16 years ago
tomoyo	KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]	16 years ago
Kconfig	Merge commit 'v2.6.31-rc8' into x86/txt	16 years ago
Makefile	…
capability.c	LSM/SELinux: inode_{get,set,notify}secctx hooks to access LSM security context information.	16 years ago
commoncap.c	…
device_cgroup.c	…
inode.c	…
lsm_audit.c	…
min_addr.c	…
root_plug.c	…
security.c	LSM/SELinux: inode_{get,set,notify}secctx hooks to access LSM security context information.	16 years ago