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	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
appletalk
atm	atm: use scnprintf() instead of sprintf()	2012-12-17 20:50:51 -08:00
ax25
batman-adv	batman-adv: unbloat batadv_priv if debug is not enabled	2013-01-12 20:58:23 +10:00
bluetooth	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-12-13 12:00:48 -08:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
caif	caif_usb: Make the driver name check more efficient	2012-12-09 00:34:02 -05:00
can	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2013-01-02 17:32:49 -08:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
dcb	net: Allow DCBnl to use other namespaces besides init_net	2012-12-10 14:09:01 -05:00
dccp	inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock	2012-12-14 13:14:07 -05:00
decnet
dns_resolver	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-12-16 15:40:50 -08:00
dsa	net: phy: remove flags argument from phy_{attach, connect, connect_direct}	2013-01-14 15:11:50 -05:00
ethernet	net: remove unnecessary NET_ADDR_RANDOM "bitclean"	2013-01-03 22:37:36 -08:00
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	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
iucv	s390/irq: remove split irq fields from /proc/stat	2013-01-08 10:57:07 +01:00
key
l2tp
lapb
llc
mac80211	mac80211: fix maximum MTU	2013-01-03 13:00:01 +01:00
mac802154	mac802154: fix NOHZ local_softirq_pending 08 warning	2013-01-04 13:47:21 -08:00
netfilter	netfilter: x_tables: print correct hook names for ARP	2013-01-13 12:54:12 +01:00
netlabel
netlink	netlink: Use FIELD_SIZEOF() in netlink_proto_init().	2013-01-09 23:38:23 -08:00
netrom
nfc	nfc: remove noisy message from llcp_sock_sendmsg	2012-12-13 12:58:10 -05:00
openvswitch	openvswitch: Use FIELD_SIZEOF() in dp_init().	2013-01-09 23:38:24 -08:00
packet
phonet
rds	IB/rds: suppress incompatible protocol when version is known	2012-12-26 15:17:37 -08:00
rfkill	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
rose
rxrpc	rxrpc: Use FIELD_SIZEOF() in af_rxrpc_init().	2013-01-09 23:38:24 -08:00
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	NFS client bugfixe for Linux 3.8	2013-01-11 12:09:04 -08:00
tipc	tipc: refactor accept() code for improved readability	2012-12-07 17:23:24 -05:00
unix	unix: Use FIELD_SIZEOF() in af_unix_init().	2013-01-09 23:38:24 -08:00
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	net: Add support for XPS without sysfs being defined	2013-01-10 22:47:04 -08:00
Makefile
nonet.c
socket.c
sysctl_net.c