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
..
include	flowcache: Make flow cache name space aware	2014-02-12 07:02:11 +01:00
ss	Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux into for-linus	2014-02-24 14:40:16 +11:00
.gitignore
avc.c
exports.c
hooks.c	Linux 3.13	2014-02-05 10:39:48 -05:00
Kconfig
Makefile
netif.c
netlabel.c
netlink.c
netnode.c
netport.c
nlmsgtab.c	selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types	2014-02-05 12:20:48 -05:00
selinuxfs.c
xfrm.c	selinux: look for IPsec labels on both inbound and outbound packets	2013-12-12 17:21:31 -05:00