David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
bcm_sf2_regs.h	net: dsa: bcm_sf2: add HW bridging support	2015-02-25 17:03:38 -05:00
bcm_sf2.c	net: dsa: bcm_sf2: add HW bridging support	2015-02-25 17:03:38 -05:00
bcm_sf2.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
Kconfig	net: dsa: bcm_sf2: always select FIXED_PHY	2014-12-16 00:57:07 -05:00
Makefile	net: dsa: Add support for Marvell 88E6352	2014-10-30 14:54:10 -04:00
mv88e6xxx.c	net: dsa: mv88e6352: Refactor shareable code	2015-02-19 15:52:25 -05:00
mv88e6xxx.h	net: dsa: mv88e6352: Refactor shareable code	2015-02-19 15:52:25 -05: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: Centralise code for reading the temperature sensor	2014-11-16 15:47:26 -05:00
mv88e6131.c	dsa: do not dereference non-existing routing table	2015-02-07 22:07:36 -08:00
mv88e6171.c	net: dsa: mv88e6171: Enable access to phys via internal mdio bus	2015-02-19 15:52:25 -05:00
mv88e6352.c	net: dsa: mv88e6352: Refactor shareable code	2015-02-19 15:52:25 -05:00