David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-06 18:44:57 -07:00
..
chip.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 18:44:57 -07:00
chip.h	net: dsa: mv88e6xxx: add PTP support for MV88E6250 family	2019-08-02 17:58:53 -07:00
global1_atu.c	net: dsa: mv88e6xxx: introduce helpers for handling chip->reg_lock	2019-06-23 11:11:11 -07:00
global1_vtu.c	net: dsa: mv88e6xxx: introduce helpers for handling chip->reg_lock	2019-06-23 11:11:11 -07:00
global1.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
global1.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
global2_avb.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
global2_scratch.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
global2.c	net: dsa: mv88e6xxx: introduce helpers for handling chip->reg_lock	2019-06-23 11:11:11 -07:00
global2.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
hwtstamp.c	net: dsa: mv88e6xxx: introduce helpers for handling chip->reg_lock	2019-06-23 11:11:11 -07:00
hwtstamp.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	net: dsa: mv88e6xxx: refine SMI support	2019-05-05 21:50:22 -07:00
phy.c	net: dsa: mv88e6xxx: introduce helpers for handling chip->reg_lock	2019-06-23 11:11:11 -07:00
phy.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
port.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
port.h	net: dsa: mv88e6xxx: add support for MV88E6220	2019-08-02 17:58:53 -07:00
ptp.c	net: dsa: mv88e6xxx: add PTP support for MV88E6250 family	2019-08-02 17:58:53 -07:00
ptp.h	net: dsa: mv88e6xxx: add PTP support for MV88E6250 family	2019-08-02 17:58:53 -07:00
serdes.c	net: dsa: mv88e6xxx: introduce helpers for handling chip->reg_lock	2019-06-23 11:11:11 -07:00
serdes.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
smi.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
smi.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00