David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c

2010-04-11 14:53:53 -07:00

..

dsa_priv.h

netdev: convert pseudo-devices to netdev_tx_t

2009-09-01 01:13:07 -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

Kconfig

dsa: add support for the Marvell 88E6095/6095F switch chips

2009-03-21 19:06:54 -07:00

Makefile

dsa: add support for the Marvell 88E6060 switch chip

2008-10-08 17:24:22 -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: move address list functions to a separate file

2010-04-03 14:22:11 -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