David S. Miller a1744d3bee Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/p54/p54common.c		2008-10-31 00:17:34 -07:00
..
keys	keys: remove unused key_alloc_sem	2008-06-06 11:29:11 -07:00
selinux	net: replace %p6 with %pI6	2008-10-29 12:52:50 -07: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 capabilities: uninline cap_safe_nice	2008-09-27 15:07:56 +10: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