David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-10 18:32:51 -05:00
..
appletalk
arcnet
bonding	bonding: fix second off-by-one error	2012-11-01 11:53:44 -04:00
caif
can	can: sja1000: fix/add miniPCIe/cPCI PC/104Plus PCI/104e PEAK-System boards	2012-10-24 10:53:49 +02:00
cris
dsa
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
fddi
hamradio	sections: fix section conflicts in drivers/net/hamradio	2012-10-06 03:04:43 +09:00
hippi
hyperv	hyperv: Remove unnecessary comments in rndis_filter_receive_data()	2012-10-21 20:35:40 -04:00
ieee802154	workqueue: avoid using deprecated functions	2012-10-02 16:01:31 -07:00
irda	irda: sh-irda: Remove SH7377 support	2012-11-08 21:59:35 -05:00
phy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
plip
ppp	ppp: make ppp_get_stats64 static	2012-11-01 12:38:31 -04:00
slip
team	team: set qdisc_tx_busylock to avoid LOCKDEP splat	2012-10-04 15:53:48 -04:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
vmxnet3	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
wan	Make the wanxl firmware array const	2012-11-09 16:28:37 -05:00
wimax
wireless	drivers/net: use tasklet_kill in device remove/close process	2012-11-03 15:10:15 -04:00
xen-netback	xen: netback: handle compound page fragments on transmit.	2012-10-10 22:50:45 -04:00
dummy.c
eql.c
ifb.c
Kconfig	vxlan: Depend on CONFIG_INET	2012-10-02 14:37:31 -04:00
LICENSE.SRC
loopback.c
macvlan.c
macvtap.c
Makefile	vxlan: virtual extensible lan	2012-10-01 18:39:45 -04:00
mdio.c
mii.c
netconsole.c	netconsole: add oops_only module option	2012-11-08 22:06:36 -05:00
rionet.c	rapidio/rionet: rework to support multiple RIO master ports	2012-10-06 03:05:23 +09:00
sb1000.c
Space.c
sungem_phy.c
tun.c	tun: report orphan frags errors to zero copy callback	2012-11-02 21:29:57 -04:00
veth.c	veth: allow changing the mac address while interface is up	2012-11-01 12:26:10 -04:00
virtio_net.c	virtio_net: use net_*_ratelimited() helpers	2012-11-09 17:05:28 -05:00
vxlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
xen-netfront.c	Features:	2012-10-07 07:13:01 +09:00