David S. Miller 17f7f4d9fc Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/ipv4/fib_frontend.c

2010-12-26 22:37:05 -08:00

..

apparmor

APPARMOR: Fix memory leak of apparmor_init()

2010-11-11 07:36:22 +11:00

integrity/ima

IMA: fix the ToMToU logic

2010-10-26 11:37:19 -07:00

keys

KEYS: Don't call up_write() if __key_link_begin() returns an error

2010-12-23 15:31:48 -08:00

selinux

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-26 22:37:05 -08:00

smack

capabilities/syslog: open code cap_syslog logic to fix build failure

2010-11-15 15:40:01 -08:00

tomoyo

fs: take dcache_lock inside __d_path

2010-10-25 21:26:12 -04:00

capability.c

capabilities/syslog: open code cap_syslog logic to fix build failure

2010-11-15 15:40:01 -08:00

commoncap.c

capabilities/syslog: open code cap_syslog logic to fix build failure

2010-11-15 15:40:01 -08:00

device_cgroup.c

Merge branch 'master' into next

2010-05-06 10:56:07 +10:00

inode.c

convert get_sb_single() users

2010-10-29 04:16:28 -04:00

Kconfig

Restrict unprivileged access to kernel syslog

2010-11-12 07:55:32 -08:00

lsm_audit.c

Merge branch 'master' into next

2010-05-06 10:56:07 +10:00

Makefile

AppArmor: Enable configuring and building of the AppArmor security module

2010-08-02 15:38:34 +10:00

min_addr.c

mmap_min_addr check CAP_SYS_RAWIO only for write

2010-04-23 08:56:31 +10:00

security.c

capabilities/syslog: open code cap_syslog logic to fix build failure

2010-11-15 15:40:01 -08:00