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
tomoyo
capability.c
commoncap.c
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
Kconfig
lsm_audit.c	inet: rename some inet_sock fields	2009-10-18 18:52:53 -07:00
Makefile
min_addr.c	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
root_plug.c
security.c