linux_dsm_epyc7002/drivers/net/ethernet/cadence
David S. Miller 3f3558bb51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/xen-netfront.c

Minor overlapping changes in xen-netfront.c, mostly to do
with some buffer management changes alongside the split
of stats into TX and RX.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-15 00:53:17 -05:00
..
at91_ether.c net/at91_ether: prepare and unprepare clock 2015-01-12 15:35:47 -05:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-12-11 14:27:06 -08:00
macb.c net/macb: improved ethtool statistics support 2015-01-14 00:25:50 -05:00
macb.h net/macb: improved ethtool statistics support 2015-01-14 00:25:50 -05:00
Makefile net/at91_ether: select MACB in Kconfig 2012-10-23 02:40:09 -04:00