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
..
include	xfrm: invalidate dst on policy insertion/deletion	2012-09-18 15:57:03 -04:00
ss	SELinux: avc: remove the useless fields in avc_add_callback	2012-04-09 12:23:44 -04:00
.gitignore	SELinux: add .gitignore files for dynamic classes	2009-10-24 09:42:27 +08:00
Kconfig	selinux: Deprecate and schedule the removal of the the compat_net functionality	2008-12-31 12:54:11 -05:00
Makefile	selinux: change to new flag variable	2010-10-21 10:12:40 +11:00
avc.c	selinux: tag avc cache alloc as non-critical	2012-07-31 18:42:47 -07:00
exports.c	selinux: sparse fix: include selinux.h in exports.c	2011-09-09 16:56:32 -07:00
hooks.c	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-30 17:25:34 -07:00
netif.c	SELinux: avc: remove the useless fields in avc_add_callback	2012-04-09 12:23:44 -04:00
netlabel.c	doc: Update the email address for Paul Moore in various source files	2011-08-01 17:58:33 -07:00
netlink.c	netlink: hide struct module parameter in netlink_kernel_create	2012-09-08 18:46:30 -04:00
netnode.c	SELinux: avc: remove the useless fields in avc_add_callback	2012-04-09 12:23:44 -04:00
netport.c	SELinux: avc: remove the useless fields in avc_add_callback	2012-04-09 12:23:44 -04:00
nlmsgtab.c	netfilter: remove ip_queue support	2012-05-08 20:25:42 +02:00
selinuxfs.c	switch dentry_open() to struct path, make it grab references itself	2012-07-23 00:01:29 +04:00
xfrm.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00