linux_dsm_epyc7002/drivers/net/ethernet/freescale
David S. Miller 32efe08d77 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c

Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-02-19 16:03:15 -05:00
..
fs_enet netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-06 11:48:09 -05:00
fec_mpc52xx_phy.c freescale: Move the Freescale drivers 2011-08-12 00:22:12 -07:00
fec_mpc52xx.c netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-06 11:48:09 -05:00
fec_mpc52xx.h drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
fec.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-19 16:03:15 -05:00
fec.h net: fsl: fec: handle 10Mbps speed in RMII mode 2012-01-12 20:05:28 -08:00
fsl_pq_mdio.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-12-16 02:11:14 -05:00
fsl_pq_mdio.h freescale: Move the Freescale drivers 2011-08-12 00:22:12 -07:00
gianfar_ethtool.c drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
gianfar_ptp.c net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
gianfar_sysfs.c drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
gianfar.c drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
gianfar.h drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05: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 freescale: Move the Freescale drivers 2011-08-12 00:22:12 -07:00
ucc_geth.c netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-06 11:48:09 -05:00
ucc_geth.h ucc_geth: Convert ENET_NUM_OCTETS_PER_ADDRESS uses to ETH_ALEN 2011-11-16 20:23:18 -05:00