David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>		2011-12-23 17:13:56 -05:00
..
include	selinux: sparse fix: fix several warnings in the security server code	2011-09-09 16:56:32 -07:00
ss	selinux: sparse fix: fix several warnings in the security server code	2011-09-09 16:56:32 -07: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: don't transliterate MAY_NOT_BLOCK to IPERM_FLAG_RCU	2011-07-20 01:43:27 -04:00
exports.c	selinux: sparse fix: include selinux.h in exports.c	2011-09-09 16:56:32 -07:00
hooks.c	inet_diag: Partly rename inet_ to sock_	2011-12-06 13:57:36 -05:00
netif.c	doc: Update the email address for Paul Moore in various source files	2011-08-01 17:58:33 -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: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:32 -04:00
netnode.c	net: remove ipv6_addr_copy()	2011-11-22 16:43:32 -05:00
netport.c	SELinux: Fix RCU deref check warning in sel_netport_insert()	2011-12-21 11:28:56 +11:00
nlmsgtab.c	selinux: sparse fix: fix warnings in netlink code	2011-09-09 16:56:31 -07:00
selinuxfs.c	selinux: sparse fix: fix warnings in netlink code	2011-09-09 16:56:31 -07:00
xfrm.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00