OpenCloudOS-Kernel/drivers/net/ethernet/renesas
David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-02-23 00:09:14 -05:00
..
Kconfig drivers/net: remove all references to obsolete Ethernet-HOWTO 2015-06-23 06:50:35 -07:00
Makefile Renesas Ethernet AVB PTP clock driver 2015-06-11 00:24:12 -07:00
ravb.h ravb: factor out register bit twiddling code 2016-02-10 05:38:12 -05:00
ravb_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-02-23 00:09:14 -05:00
ravb_ptp.c ravb: factor out register bit twiddling code 2016-02-10 05:38:12 -05:00
sh_eth.c sh_eth: kill useless *switch* defaults 2016-02-17 15:30:23 -05:00
sh_eth.h sh_eth: remove EDMAC_BIG_ENDIAN 2016-01-04 16:11:11 -05:00