WSL2-Linux-Kernel/net/dsa
David S. Miller 11fe883936 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36f
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>
2010-07-20 18:25:24 -07:00
..
Kconfig dsa: Fix Kconfig dependencies. 2010-07-12 20:03:42 -07:00
Makefile dsa: add support for the Marvell 88E6060 switch chip 2008-10-08 17:24:22 -07:00
dsa.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dsa_priv.h netdev: convert pseudo-devices to netdev_tx_t 2009-09-01 01:13:07 -07:00
mv88e6xxx.c dsa: fix 88e6xxx statistics counter snapshotting 2009-07-05 18:03:35 -07:00
mv88e6xxx.h dsa: add support for the Marvell 88E6131 switch chip 2008-10-08 17:24:09 -07:00
mv88e6060.c dsa: add switch chip cascading support 2009-03-21 19:06:54 -07:00
mv88e6123_61_65.c dsa: add switch chip cascading support 2009-03-21 19:06:54 -07:00
mv88e6131.c dsa: add switch chip cascading support 2009-03-21 19:06:54 -07:00
slave.c net: preserve ifreq parameter when calling generic phy_mii_ioctl(). 2010-07-18 19:15:25 -07:00
tag_dsa.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
tag_edsa.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
tag_trailer.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00