Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ...

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

2010-03-08 16:55:37 +01:00

..

integrity/ima

security: fix error return path in ima_inode_alloc

2010-02-25 07:54:33 +11:00

keys

security: Apply lockdep-based checking to rcu_dereference() uses

2010-02-25 10:34:52 +01:00

selinux

Merge branch 'for-next' into for-linus

2010-03-08 16:55:37 +01:00

smack

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2010-03-04 08:15:33 -08:00

tomoyo

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2010-03-04 08:15:33 -08:00

capability.c

Security: add static to security_ops and default_security_ops variable

2010-02-24 08:11:02 +11:00

commoncap.c

syslog: clean up needless comment

2010-02-05 17:48:51 +11:00

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

get rid of pointless checks after simple_pin_fs()

2010-01-26 22:22:26 -05:00

Kconfig

remove CONFIG_SECURITY_FILE_CAPABILITIES compile option

2009-11-24 15:06:47 +11:00

lsm_audit.c

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-12-05 15:22:26 -08:00

Makefile

NOMMU: Optimise away the {dac_,}mmap_min_addr tests

2009-12-17 09:25:19 +11:00

min_addr.c

security/min_addr.c: make init_mmap_min_addr() static

2009-12-17 09:24:22 +11:00

security.c

Merge branch 'next' into for-linus

2010-03-01 09:36:31 +11:00