Ingo Molnar 936e894a97 Merge commit 'v2.6.31-rc8' into x86/txt ... Conflicts: arch/x86/kernel/reboot.c security/Kconfig Merge reason: resolve the conflicts, bump up from rc3 to rc8. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-09-02 08:17:56 +02:00
..
integrity/ima	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2009-08-26 20:17:07 -07:00
keys	keys: Handle there being no fallback destination keyring for request_key()	2009-04-09 10:41:19 -07:00
selinux	Security/SELinux: seperate lsm specific mmap_min_addr	2009-08-17 15:09:11 +10:00
smack	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2009-06-11 10:01:41 -07:00
tomoyo	TOMOYO: Add description of lists and structures.	2009-06-09 09:30:24 +10:00
capability.c	Capabilities: move cap_file_mmap to commoncap.c	2009-08-17 15:08:35 +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	securityfs: securityfs_remove should handle IS_ERR pointers	2009-05-12 11:06:11 +10:00
Kconfig	Merge commit 'v2.6.31-rc8' into x86/txt	2009-09-02 08:17:56 +02:00
lsm_audit.c	smack: implement logging V3	2009-04-14 09:00:19 +10:00
Makefile	Security/SELinux: seperate lsm specific mmap_min_addr	2009-08-17 15:09:11 +10:00
min_addr.c	Security/SELinux: seperate lsm specific mmap_min_addr	2009-08-17 15:09:11 +10:00
root_plug.c	rootplug: Remove redundant initialization.	2009-05-27 13:30:46 +10:00
security.c	security: use mmap_min_addr indepedently of security models	2009-06-04 12:07:48 +10:00