linux_dsm_epyc7002/drivers/net/ethernet/freescale
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
fs_enet net:drivers/net: Miscellaneous conversions to ETH_ALEN 2013-10-02 17:04:45 -04:00
fec_main.c net: fec: remove deprecated IRQF_DISABLED 2013-09-15 22:01:05 -04: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
fec_ptp.c fec: Only pass pdev in fec_ptp_init() 2013-06-07 14:41:07 -07:00
fec.h net: fec: fix the error to get the previous BD entry 2013-09-04 14:14:54 -04:00
fsl_pq_mdio.c net: fsl_pq_mdio: remove unnecessary dev_set_drvdata() 2013-08-21 12:27:04 -07:00
gianfar_ethtool.c gianfar: Add flow control support 2013-08-13 15:28:53 -07:00
gianfar_ptp.c powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file 2013-09-30 21:17:16 -07:00
gianfar_sysfs.c gianfar: Use netdev_<level> when possible 2013-04-14 15:41:49 -04:00
gianfar.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
gianfar.h gianfar: Remove extern from function prototypes 2013-09-24 10:09:27 -04:00
Kconfig NET: FEC: dynamtic check DMA desc buff type 2013-01-04 15:15:39 -08:00
Makefile net: fec: build fec.c and fec_ptp.c to one module 2013-03-25 12:14:57 -04:00
ucc_geth_ethtool.c ucc_geth: Convert ugeth_<level> to pr_<level> 2013-04-14 15:41:49 -04:00
ucc_geth.c net:drivers/net: Miscellaneous conversions to ETH_ALEN 2013-10-02 17:04:45 -04:00
ucc_geth.h net: remove skb recycling 2012-10-07 00:40:54 -04:00
xgmac_mdio.c net: ethernet: use platform_{get,set}_drvdata() 2013-05-25 21:27:58 -07:00