linux-sg2042/net/dsa
David S. Miller 7143b7d412 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/tg3.c
2011-05-05 14:59:02 -07:00
..
Kconfig dsa/mv88e6131: fix unknown multicast/broadcast forwarding on mv88e6085 2011-04-28 13:35:44 -07:00
Makefile dsa: add support for the Marvell 88E6060 switch chip 2008-10-08 17:24:22 -07:00
dsa.c module: fix missing semicolons in MODULE macro usage 2011-01-24 14:32:54 +10:30
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/mv88e6131: add support for mv88e6085 switch 2011-04-06 13:32:53 -07:00
mv88e6060.c dsa/mv88e6060: support nonzero mii base address 2011-03-08 14:24:20 -08:00
mv88e6123_61_65.c dsa: add switch chip cascading support 2009-03-21 19:06:54 -07:00
mv88e6131.c dsa/mv88e6131: fix unknown multicast/broadcast forwarding on mv88e6085 2011-04-28 13:35:44 -07:00
slave.c net: dsa: remove ethtool_ops->set_sg 2011-04-20 01:30:39 -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