1
0
Fork 0
alistair23-linux/drivers/net/dsa/mv88e6xxx
David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-12-20 11:53:36 -08:00
..
Kconfig net: dsa: mv88e6xxx: expose switch time as a PTP hardware clock 2018-02-14 14:33:36 -05:00
Makefile net: dsa: mv88e6xxx: add rx/tx timestamping support 2018-02-14 14:33:37 -05:00
chip.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-12-20 11:53:36 -08:00
chip.h net: dsa: mv88e6xxx: Add SERDES phydev_mac_change up for 6390 2018-08-09 11:08:20 -07:00
global1.c net: dsa: mv88e6xxx: Fix clearing of stats counters 2018-11-11 10:19:10 -08:00
global1.h net: dsa: mv88e6xxx: Fix ATU Miss Violation 2018-09-17 08:03:53 -07:00
global1_atu.c net: dsa: mv88e6xxx: Fix ATU Miss Violation 2018-09-17 08:03:53 -07:00
global1_vtu.c net: dsa: mv88e6xxx: Make VTU miss violations less spammy 2018-03-29 15:04:22 -04:00
global2.c net: dsa: mv88e6xxx: Remove OF check for IRQ domain 2018-05-20 18:58:27 -04:00
global2.h net: dsa: mv88e6xxx: Add MV88E6165 AVB register access 2018-07-18 15:05:38 -07:00
global2_avb.c net: dsa: mv88e6xxx: Add MV88E6165 AVB register access 2018-07-18 15:05:38 -07:00
global2_scratch.c net: dsa: mv88e6xxx: scratch registers and external MDIO pins 2018-02-22 14:46:32 -05:00
hwtstamp.c net: dsa: mv88e6xxx: Longer timeout for PTP TX timestamp 2018-07-18 15:05:38 -07:00
hwtstamp.h net: dsa: mv88e6xxx: Add hwtimestamp support for the 6165 2018-07-18 15:05:38 -07:00
phy.c net: dsa: mv88e6xxx: Fix writing to a PHY page. 2018-09-02 16:16:23 -07:00
phy.h net: dsa: mv88e6xxx: remove EEE support 2017-08-01 20:09:10 -07:00
port.c net: dsa: mv88e6xxx: Default ports 9/10 6390X CMODE to 1000BaseX 2018-11-11 10:17:46 -08:00
port.h net: dsa: mv88e6xxx: Differentiate between 6390 and 6390X cmodes 2018-11-11 10:17:46 -08:00
ptp.c net: dsa: mv88e6xxx: Add hwtimestamp support for the 6165 2018-07-18 15:05:38 -07:00
ptp.h net: dsa: mv88e6xxx: Set PTP Ethertype 2018-07-18 15:05:38 -07:00
serdes.c net: dsa: mv88e6xxx: Add support for SERDES on ports 2-8 for 6390X 2018-11-11 10:17:46 -08:00
serdes.h net: dsa: mv88e6xxx: Add support for SERDES on ports 2-8 for 6390X 2018-11-11 10:17:46 -08:00