linux/drivers/net/dsa
David S. Miller 55b42b5ca2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/marvell.c

Simple overlapping changes in drivers/net/phy/marvell.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-01 14:53:27 -04:00
..
bcm_sf2_regs.h net: dsa: bcm_sf2: add support for controlling EEE 2014-09-28 17:14:09 -04:00
bcm_sf2.c net: dsa: bcm_sf2: add support for controlling EEE 2014-09-28 17:14:09 -04:00
bcm_sf2.h net: dsa: bcm_sf2: add support for controlling EEE 2014-09-28 17:14:09 -04:00
Kconfig net: dsa/mv88e6352: Add support for MV88E6176 2014-10-30 14:54:10 -04:00
Makefile net: dsa: Add support for Marvell 88E6352 2014-10-30 14:54:10 -04:00
mv88e6xxx.c net: dsa: Provide additional RMON statistics 2014-10-30 14:54:12 -04:00
mv88e6xxx.h net: dsa/mv88e6123_61_65: Add support for reading switch registers 2014-10-30 14:54:11 -04:00
mv88e6060.c net: dsa: Report known silicon revisions for Marvell 88E6060 2014-10-30 14:54:10 -04:00
mv88e6123_61_65.c net: dsa: Provide additional RMON statistics 2014-10-30 14:54:12 -04:00
mv88e6131.c net: dsa: Report known silicon revisions for Marvell 88E6131 2014-10-30 14:54:10 -04:00
mv88e6171.c dsa: mv88e6171: Fix tagging protocol/Kconfig 2014-10-28 15:27:54 -04:00
mv88e6352.c net: dsa: Provide additional RMON statistics 2014-10-30 14:54:12 -04:00