linux_dsm_epyc7002/drivers/net/ethernet/freescale
David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/e1000e/param.c
	drivers/net/wireless/iwlwifi/iwl-agn-rx.c
	drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
	drivers/net/wireless/iwlwifi/iwl-trans.h

Resolved the iwlwifi conflict with mainline using 3-way diff posted
by John Linville and Stephen Rothwell.  In 'net' we added a bug
fix to make iwlwifi report a more accurate skb->truesize but this
conflicted with RX path changes that happened meanwhile in net-next.

In e1000e a conflict arose in the validation code for settings of
adapter->itr.  'net-next' had more sophisticated logic so that
logic was used.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-07 23:35:40 -04:00
..
fs_enet fs_enet: Support the get_ts_info ethtool method. 2012-04-04 05:28:47 -04:00
fec_mpc52xx_phy.c freescale: Move the Freescale drivers 2011-08-12 00:22:12 -07:00
fec_mpc52xx.c fec_mpc52xx: Support the get_ts_info ethtool method. 2012-04-04 05:28:47 -04:00
fec_mpc52xx.h drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
fec.c fec: Support the get_ts_info ethtool method. 2012-04-04 05:28:47 -04:00
fec.h net: fsl: fec: handle 10Mbps speed in RMII mode 2012-01-12 20:05:28 -08:00
fsl_pq_mdio.c Fix non TBI PHY access; a bad merge undid bug fix in a previous commit. 2012-04-01 16:47:12 -04:00
fsl_pq_mdio.h freescale: Move the Freescale drivers 2011-08-12 00:22:12 -07:00
gianfar_ethtool.c gianfar: Include linux/net_tstamp.h 2012-04-06 00:35:34 -04:00
gianfar_ptp.c gianfar: Support the get_ts_info ethtool method. 2012-04-04 05:28:45 -04:00
gianfar_sysfs.c drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
gianfar.c gianfar: add GRO support 2012-04-21 16:43:34 -04:00
gianfar.h gianfar: Support the get_ts_info ethtool method. 2012-04-04 05:28:45 -04:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-01-04 21:35:43 -05:00
Makefile freescale: Move the Freescale drivers 2011-08-12 00:22:12 -07:00
ucc_geth_ethtool.c ucc_geth: Support the get_ts_info ethtool method. 2012-04-04 05:28:48 -04:00
ucc_geth.c ucc_geth: Add 16 bytes to max TX frame for VLANs 2012-05-02 20:09:04 -04:00
ucc_geth.h net: ucc_geth, increase no. of HW RX descriptors 2012-05-02 20:09:04 -04:00