David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
apparmor	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2013-11-21 19:46:00 -08:00
integrity	Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM	2014-01-06 22:23:01 +11:00
keys	security: shmem: implement kernel private shmem inodes	2013-12-02 11:24:19 +00:00
selinux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
smack	Merge git://git.infradead.org/users/eparis/audit	2014-01-23 18:08:10 -08:00
tomoyo	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
yama	yama: Better permission check for ptraceme	2013-03-26 13:17:58 -07:00
Kconfig	security: select correct default LSM_MMAP_MIN_ADDR on arm on arm64	2014-02-05 14:59:14 +00:00
Makefile	security: remove erroneous comment about capabilities.o link ordering	2013-09-24 11:26:28 +10:00
capability.c	Linux 3.12	2013-11-26 17:32:55 -05:00
commoncap.c	capabilities: allow nice if we are privileged	2013-08-30 23:44:09 -07:00
device_cgroup.c	cgroup: replace cftype->read_seq_string() with cftype->seq_show()	2013-12-05 12:28:04 -05:00
inode.c	securityfs: fix object creation races	2012-01-10 10:20:35 -05:00
lsm_audit.c	Merge git://git.infradead.org/users/eparis/audit	2013-11-21 19:18:14 -08:00
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	2010-04-23 08:56:31 +10:00
security.c	Linux 3.12	2013-11-26 17:32:55 -05:00