David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig		2009-11-18 22:19:03 -08:00
..
integrity/ima	ima: replace GFP_KERNEL with GFP_NOFS	2009-11-19 08:42:01 +11:00
keys	KEYS: get_instantiation_keyring() should inc the keyring refcount in all cases	2009-10-15 15:19:58 -07:00
selinux	do_wait() wakeup optimization: change __wake_up_parent() to use filtered wakeup	2009-09-24 07:20:59 -07:00
smack	seq_file: constify seq_operations	2009-09-23 07:39:29 -07: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
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	cgroups: let ss->can_attach and ss->attach do whole threadgroups at a time	2009-09-24 07:20:58 -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	inet: rename some inet_sock fields	2009-10-18 18:52:53 -07:00
Makefile	Security/SELinux: seperate lsm specific mmap_min_addr	2009-08-17 15:09:11 +10:00
min_addr.c	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
root_plug.c	rootplug: Remove redundant initialization.	2009-05-27 13:30:46 +10:00
security.c	LSM/SELinux: inode_{get,set,notify}secctx hooks to access LSM security context information.	2009-09-10 10:11:24 +10:00