David S. Miller 7e452baf6b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/message/fusion/mptlan.c drivers/net/sfc/ethtool.c net/mac80211/debugfs_sta.c		2008-11-11 15:43:02 -08:00
..
keys	KEYS: Make request key instantiate the per-user keyrings	2008-11-10 13:20:57 -08:00
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	Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next	2008-10-11 09:26:14 +11:00
capability.c	security: Fix setting of PF_SUPERPRIV by __capable()	2008-08-14 22:59:43 +10:00
commoncap.c	file caps: always start with clear bprm->caps_*	2008-11-01 09:49:45 -07:00
device_cgroup.c	devcgroup: remove spin_lock()	2008-10-20 08:52:38 -07:00
inode.c	integrity: special fs magic	2008-10-13 09:47:43 +11:00
Kconfig	securityfs: do not depend on CONFIG_SECURITY	2008-08-28 10:47:42 +10:00
Makefile	securityfs: do not depend on CONFIG_SECURITY	2008-08-28 10:47:42 +10:00
root_plug.c	security: Fix setting of PF_SUPERPRIV by __capable()	2008-08-14 22:59:43 +10:00
security.c	nfsd: fix vm overcommit crash	2008-10-30 11:38:47 -07:00