David S. Miller 9eeda9abd1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/ath5k/base.c net/8021q/vlan_core.c		2008-11-06 22:43:03 -08:00
..
keys
selinux	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-06 22:43:03 -08:00
smack
capability.c
commoncap.c	file caps: always start with clear bprm->caps_*	2008-11-01 09:49:45 -07:00
device_cgroup.c
inode.c
Kconfig
Makefile
root_plug.c
security.c	nfsd: fix vm overcommit crash	2008-10-30 11:38:47 -07:00