David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-15 15:05:59 -05:00
..
9p
802
8021q
appletalk
atm
ax25
batman-adv	batman-adv: unbloat batadv_priv if debug is not enabled	2013-01-12 20:58:23 +10:00
bluetooth
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
caif
can
ceph
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
dcb
dccp
decnet
dns_resolver
dsa	net: phy: remove flags argument from phy_{attach, connect, connect_direct}	2013-01-14 15:11:50 -05:00
ethernet
ieee802154
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
ipx
irda
iucv
key
l2tp
lapb
llc
mac80211
mac802154
netfilter	netfilter: x_tables: print correct hook names for ARP	2013-01-13 12:54:12 +01:00
netlabel
netlink
netrom
nfc
openvswitch
packet
phonet
rds
rfkill
rose
rxrpc
sched	pkt_sched: namespace aware act_mirred	2013-01-14 15:09:36 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
sunrpc
tipc
unix
wanrouter
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
x25
xfrm
compat.c
Kconfig
Makefile
nonet.c
socket.c
sysctl_net.c