David S. Miller abaa72d7fd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

2012-07-19 11:17:30 -07:00

..

apparmor

split ->file_mmap() into ->mmap_addr()/->mmap_file()

2012-05-31 13:11:54 -04:00

integrity

ima: fix filename hint to reflect script interpreter name

2012-05-16 10:36:41 +10:00

keys

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

2012-05-31 18:47:30 -07:00

selinux

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-07-19 11:17:30 -07:00

smack

split ->file_mmap() into ->mmap_addr()/->mmap_file()

2012-05-31 13:11:54 -04:00

tomoyo

Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next

2012-05-22 11:21:06 +10:00

yama

Yama: replace capable() with ns_capable()

2012-05-15 10:27:57 +10:00

capability.c

split ->file_mmap() into ->mmap_addr()/->mmap_file()

2012-05-31 13:11:54 -04:00

commoncap.c

split ->file_mmap() into ->mmap_addr()/->mmap_file()

2012-05-31 13:11:54 -04:00

device_cgroup.c

cgroup: convert all non-memcg controllers to the new cftype interface

2012-04-01 12:09:55 -07:00

inode.c

securityfs: fix object creation races

2012-01-10 10:20:35 -05:00

Kconfig

KEYS: Move the key config into security/keys/Kconfig

2012-05-11 10:56:56 +01:00

lsm_audit.c

LSM: BUILD_BUG_ON if the common_audit_data union ever grows

2012-04-09 12:23:03 -04:00

Makefile

security: Yama LSM

2012-02-10 09:18:52 +11:00

min_addr.c

mmap_min_addr check CAP_SYS_RAWIO only for write

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

security.c

security: Fix nommu build.

2012-07-03 21:41:03 +10:00