David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-17 22:08:28 -05:00
..
fs_enet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-17 22:08:28 -05:00
fec_main.c	net: fec: no need to test for the return type of of_property_read_u32	2015-11-24 16:09:47 -05:00
fec_mpc52xx_phy.c	net/fsl: constify of_device_id array	2015-03-17 15:00:21 -04:00
fec_mpc52xx.c	net: mpc52xx: Use platform_register/unregister_drivers()	2015-12-03 15:14:58 -05:00
fec_mpc52xx.h
fec_ptp.c	net: fec: avoid timespec use	2015-10-05 03:16:39 -07:00
fec.h	net: fec: introduce fec_ptp_stop and use in probe fail path	2015-07-26 21:51:53 -07:00
fsl_pq_mdio.c	net: fsl: avoid 64-bit warning on pq_mdio	2015-12-08 22:51:56 -05:00
gianfar_ethtool.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-11-01 00:15:30 -04:00
gianfar_ptp.c	net: fsl: Fix error checking for platform_get_irq()	2015-11-30 15:19:44 -05:00
gianfar.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-17 22:08:28 -05:00
gianfar.h	gianfar: Don't enable RX Filer if not supported	2015-12-16 18:31:00 -05:00
Kconfig	net: fsl: expands dependencies of NET_VENDOR_FREESCALE	2015-11-23 12:11:58 -05:00
Makefile	gianfar: Remove sysfs stubs for FIFOCFG and stashing	2014-02-18 15:03:02 -05:00
ucc_geth_ethtool.c	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
ucc_geth.c	net: fix phy refcounting in a bunch of drivers	2015-09-24 23:04:53 -07:00
ucc_geth.h
xgmac_mdio.c	net/fsl: constify of_device_id array	2015-03-17 15:00:21 -04:00