David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-01-28 10:33:06 -05:00
..
Kconfig	ptp_clock: Allow for it to be optional	2016-11-16 09:26:34 +01:00
Makefile	Renesas Ethernet AVB PTP clock driver	2015-06-11 00:24:12 -07:00
ravb_main.c	ravb: unmap descriptors when freeing rings	2017-01-26 18:41:05 -05:00
ravb_ptp.c	ravb: make ravb_ptp_interrupt() *void*	2016-04-14 00:48:33 -04:00
ravb.h	net: ethernet: renesas: ravb: use phydev from struct net_device	2016-08-20 22:27:17 -07:00
sh_eth.c	sh_eth: enable wake-on-lan for sh7763	2017-01-09 15:55:08 -05:00
sh_eth.h	sh_eth: add generic wake-on-lan support via magic packet	2017-01-09 15:54:00 -05:00