David S. Miller f666f87b94 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/xen-netback/netback.c net/core/filter.c A filter bug fix overlapped some cleanups and a conversion over to some new insn generation macros. A xen-netback bug fix overlapped the addition of multi-queue support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-06-05 16:22:02 -07:00
..
fs_enet	fs_enet: use the new fixed PHY helpers	2014-05-22 15:16:43 -04:00
fec_main.c	fec: Include pinctrl header file	2014-06-02 18:03:35 -07:00
fec_mpc52xx_phy.c	net: fec_mpc52xx_phy: remove unnecessary dev_set_drvdata()	2013-08-21 12:27:04 -07:00
fec_mpc52xx.c	net: ethernet: use platform_{get,set}_drvdata()	2013-05-25 21:27:58 -07:00
fec_mpc52xx.h	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
fec_ptp.c	ptp: drivers: set the number of programmable pins.	2014-03-21 14:21:14 -04:00
fec.h	fec: Implement the SIOCGHWTSTAMP ioctl	2013-11-21 17:17:37 +00:00
fsl_pq_mdio.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
gianfar_ethtool.c	gianfar: Check if phydev present on ethtool -A	2014-04-24 13:36:16 -04:00
gianfar_ptp.c	ptp: drivers: set the number of programmable pins.	2014-03-21 14:21:14 -04:00
gianfar.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-05 16:22:02 -07:00
gianfar.h	gianfar: Use Single-Queue polling for "fsl,etsec2"	2014-03-10 13:17:22 -04:00
Kconfig	NET: FEC: dynamtic check DMA desc buff type	2013-01-04 15:15:39 -08:00
Makefile	gianfar: Remove sysfs stubs for FIFOCFG and stashing	2014-02-18 15:03:02 -05:00
ucc_geth_ethtool.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
ucc_geth.c	ucc_geth: use the new fixed PHY helpers	2014-05-22 15:16:44 -04:00
ucc_geth.h	net: remove skb recycling	2012-10-07 00:40:54 -04:00
xgmac_mdio.c	drivers: clean-up prom.h implicit includes	2013-10-09 20:04:04 -05:00