David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-14 01:01:12 -05:00
..
fs_enet	net: fs_enet: set back promiscuity mode after restart	2014-10-22 15:33:13 -04:00
fec_main.c	net: fec: fix regression on i.MX28 introduced by rx_copybreak support	2014-11-07 12:08:58 -05:00
fec_mpc52xx_phy.c
fec_mpc52xx.c	fec_mpc52xx: delete unneeded test before of_node_put	2014-08-08 10:28:08 -07:00
fec_mpc52xx.h
fec_ptp.c	net: fec: ptp: fix convergence issue to support LinuxPTP stack	2014-10-15 16:40:11 -04:00
fec.h	net: fec: ptp: fix convergence issue to support LinuxPTP stack	2014-10-15 16:40:11 -04:00
fsl_pq_mdio.c	net/fsl_pq_mdio: Replace spin_event_timeout() with arch independent	2014-10-09 01:40:37 -04:00
gianfar_ethtool.c	gianfar: Implement PAUSE frame generation support	2014-10-29 14:33:16 -04:00
gianfar_ptp.c	ptp: drivers: set the number of programmable pins.	2014-03-21 14:21:14 -04:00
gianfar.c	gianfar: Implement PAUSE frame generation support	2014-10-29 14:33:16 -04:00
gianfar.h	gianfar: Implement PAUSE frame generation support	2014-10-29 14:33:16 -04:00
Kconfig	net/fsl: xgmac_mdio is dependent on OF_MDIO	2014-06-11 15:50:59 -07: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	net: ucc_geth: fix build failure	2014-08-10 21:40:15 -07:00
ucc_geth.h
xgmac_mdio.c	net/fsl: Add format length modifier to avoid negative values	2014-07-30 19:58:09 -07:00