leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1cc92eb871
linux/drivers/net/ethernet/freescale
History
David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-28 14:40:49 -04:00
..
fs_enet drivers/net/ethernet/freescale/fs_enet: fix error return code 2012-08-14 17:00:56 -07:00
fec_mpc52xx_phy.c
fec_mpc52xx.c fec_mpc52xx: fix timestamp filtering 2012-06-02 17:09:08 -04:00
fec_mpc52xx.h drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
fec.c drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions 2012-07-10 23:13:46 -07:00
fec.h net: fsl: fec: handle 10Mbps speed in RMII mode 2012-01-12 20:05:28 -08:00
fsl_pq_mdio.c net/fsl_pq_mdio: add support for the Fman 1G MDIO controller 2012-08-30 13:29:32 -04:00
gianfar_ethtool.c gianfar: fix phc index build failure 2012-09-21 13:45:29 -04:00
gianfar_ptp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-28 14:40:49 -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: Change default HW Tx queue scheduling mode 2012-09-24 16:25:16 -04:00
gianfar.h gianfar: Change default HW Tx queue scheduling mode 2012-09-24 16:25:16 -04:00
Kconfig net/fsl: introduce Freescale 10G MDIO driver 2012-08-24 12:42:42 -04:00
Makefile net/fsl: introduce Freescale 10G MDIO driver 2012-08-24 12:42:42 -04: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 net/freescale: do not export any functions from fsl_pq_mdio.c 2012-08-30 13:29:31 -04:00
ucc_geth.h net: ucc_geth, increase no. of HW RX descriptors 2012-05-02 20:09:04 -04:00
xgmac_mdio.c net/fsl: introduce Freescale 10G MDIO driver 2012-08-24 12:42:42 -04:00