David S. Miller 9f6d98c298 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c The bnx2x gso_type setting bug fix in 'net' conflicted with changes in 'net-next' that broke the gso_* setting logic out into a seperate function, which also fixes the bug in question. Thus, use the 'net-next' version. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-02-12 18:58:28 -05:00
..
appletalk
arcnet	ARCNET: remove __dev* attributes	2012-12-03 11:16:10 -08:00
bonding	netpoll: Fix __netpoll_rcu_free so that it can hold the rtnl lock	2013-02-11 19:19:33 -05:00
caif	caif: Remove unnecessary alloc/OOM messages	2013-02-04 13:22:33 -05:00
can	drivers: net: Remove remaining alloc/OOM messages	2013-02-08 17:44:39 -05:00
cris	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
dsa	DSA: Convert spaces to tabs where appropriate	2013-01-10 00:04:34 -08:00
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-12 18:58:28 -05:00
fddi	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
hamradio	drivers:net:misc: Remove unnecessary alloc/OOM messages	2013-02-04 13:22:35 -05:00
hippi	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
hyperv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-29 15:32:13 -05:00
ieee802154	remove init of dev->perm_addr in drivers	2013-01-08 18:00:48 -08:00
irda	drivers/net: fix up function prototypes after __dev* removals	2012-12-07 14:22:22 -05:00
phy	drivers:net:misc: Remove unnecessary alloc/OOM messages	2013-02-04 13:22:35 -05:00
plip
ppp
slip
team	team: allow userspace to take control over carrier	2013-02-06 15:48:09 -05:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-12 18:58:28 -05:00
vmxnet3	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-05 14:12:20 -05:00
wan	wan: Remove unnecessary alloc/OOM messages	2013-02-04 13:22:34 -05:00
wimax	drivers: net: misc: Remove unused OOM variables	2013-02-06 14:58:52 -05:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-12 18:58:28 -05:00
xen-netback	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-08 18:02:14 -05:00
dummy.c	dummy: implement carrier change	2012-12-28 15:24:19 -08:00
eql.c
ifb.c	ifb: dont hard code inet_net use	2013-01-14 15:13:39 -05:00
Kconfig
LICENSE.SRC
loopback.c	net: loopback: fix a dst refcounting issue	2013-01-27 01:30:35 -05:00
macvlan.c	macvlan: add a salt to mc_hash()	2013-02-08 17:55:48 -05:00
macvtap.c	net: fix possible wrong checksum generation	2013-01-28 00:27:15 -05:00
Makefile
mdio.c
mii.c
netconsole.c	netpoll: add IPv6 support	2013-01-08 17:56:10 -08:00
rionet.c	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
sb1000.c
Space.c	drivers/net: delete old x86 variant of the seeq8005 driver	2013-01-22 10:39:56 -05:00
sungem_phy.c
tun.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-05 14:12:20 -05:00
veth.c	veth: fix NULL dereference in veth_dellink()	2013-02-10 20:41:43 -05:00
virtio_net.c	drivers:net:misc: Remove unnecessary alloc/OOM messages	2013-02-04 13:22:35 -05:00
vxlan.c	net/vxlan: Add ethtool drvinfo	2013-01-30 22:47:22 -05:00
xen-netfront.c	xen/netfront: improve truesize tracking	2013-01-07 19:51:19 -08:00