David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/renesas/ravb_main.c kernel/bpf/syscall.c net/ipv4/ipmr.c All three conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-03 21:09:12 -05:00
..
Kconfig	net: xgene_enet: Set hardware dependency	2015-05-09 16:24:15 -04:00
Makefile	drivers: net: xgene: Add ring manager v2 functions	2015-04-30 16:03:13 -04:00
xgene_enet_ethtool.c	drivers: net: xgene: Add SGMII based 1GbE ethtool support	2014-10-14 16:09:22 -04:00
xgene_enet_hw.c	drivers: net: xgene: fix RGMII 10/100Mb mode	2015-11-08 21:00:20 -05:00
xgene_enet_hw.h	drivers: net: xgene: fix RGMII 10/100Mb mode	2015-11-08 21:00:20 -05:00
xgene_enet_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
xgene_enet_main.h	drivers: net: xgene: Add support RGMII TX/RX delay configuration	2015-10-30 12:21:51 +09:00
xgene_enet_ring2.c	drivers: net: xgene: Add ring manager v2 functions	2015-04-30 16:03:13 -04:00
xgene_enet_ring2.h	drivers: net: xgene: Add ring manager v2 functions	2015-04-30 16:03:13 -04:00
xgene_enet_sgmac.c	drivers: net: xgene: Check for IS_ERR rather than NULL for clock.	2015-06-23 07:19:21 -07:00
xgene_enet_sgmac.h	drivers: net: xgene: Add SGMII based 1GbE support	2014-10-14 16:09:21 -04:00
xgene_enet_xgmac.c	drivers: net: xgene: Adding support for TSO	2015-08-27 13:51:38 -07:00
xgene_enet_xgmac.h	drivers: net: xgene: Adding support for TSO	2015-08-27 13:51:38 -07:00