David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-23 16:49:34 -04:00
..
include	selinux: remove 'flags' parameter from avc_audit()	2013-10-04 14:13:25 -07:00
ss	SELinux: Add new labeling type native labels	2013-06-08 16:20:12 -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: remove 'flags' parameter from avc_audit()	2013-10-04 14:13:25 -07:00
exports.c	selinux: sparse fix: include selinux.h in exports.c	2011-09-09 16:56:32 -07:00
hooks.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
netif.c	net: pass info struct via netdevice notifier	2013-05-28 13:11:01 -07: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	selinux: replace obsolete NLMSG_* with type safe nlmsg_*	2013-03-28 14:25:49 -04:00
netnode.c	selinux: fix sel_netnode_insert() suspicious rcu dereference	2012-11-21 21:55:32 +11:00
netport.c	SELinux: avc: remove the useless fields in avc_add_callback	2012-04-09 12:23:44 -04:00
nlmsgtab.c	bridge: update selinux perm table for RTM_NEWMDB and RTM_DELMDB	2012-12-15 17:14:38 -08:00
selinuxfs.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
xfrm.c	selinux: fix the labeled xfrm/IPsec reference count handling	2013-05-31 17:30:07 -07:00