David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

All three conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2016-08-30 00:54:02 -04:00

..

b53

net: dsa: b53: Add JOIN_ALL_VLAN support

2016-08-26 13:15:48 -07:00

mv88e6xxx

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-08-30 00:54:02 -04:00

bcm_sf2_regs.h

net: dsa: bcm_sf2: Remove duplicate code

2016-08-26 13:15:48 -07:00

bcm_sf2.c

net: dsa: bcm_sf2: Utilize mask clear/set helpers in bcm_sf2_intr_disable

2016-08-26 21:33:33 -07:00

bcm_sf2.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-08-30 00:54:02 -04:00

Kconfig

net: dsa: bcm_sf2: Utilize core B53 driver when possible

2016-08-26 13:15:48 -07:00

Makefile

net: dsa: mv88e6xxx: move driver in its own folder

2016-06-25 11:29:47 -04:00

mv88e6060.c

net: dsa: rename switch operations structure

2016-08-24 21:45:39 -07:00

mv88e6060.h

net: dsa: Keep the mii bus and address in the private structure

2016-04-13 18:15:23 -04:00