David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-28 14:40:49 -04:00
..
apparmor	split ->file_mmap() into ->mmap_addr()/->mmap_file()	2012-05-31 13:11:54 -04:00
integrity	ima: audit is compiled only when enabled	2012-07-05 16:43:59 -04:00
keys	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-07-23 18:49:06 -07:00
selinux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
smack	smack: off by one error	2012-07-30 15:04:17 +10: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: access task_struct->comm directly	2012-08-17 20:40:38 +10:00
Kconfig	KEYS: Move the key config into security/keys/Kconfig	2012-05-11 10:56:56 +01:00
Makefile	security: Yama LSM	2012-02-10 09:18:52 +11: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
lsm_audit.c	LSM: BUILD_BUG_ON if the common_audit_data union ever grows	2012-04-09 12:23:03 -04: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