David S. Miller b26e478f8f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/freescale/fsl_pq_mdio.c net/batman-adv/translation-table.c net/ipv6/route.c		2011-12-16 02:11:14 -05:00
..
fs_enet	net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver()	2011-11-29 00:25:05 -05:00
fec_mpc52xx_phy.c	freescale: Move the Freescale drivers	2011-08-12 00:22:12 -07:00
fec_mpc52xx.c	net: remove use of ndo_set_multicast_list in drivers	2011-08-17 20:22:03 -07:00
fec_mpc52xx.h	freescale: Move the Freescale drivers	2011-08-12 00:22:12 -07:00
fec.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-16 02:11:14 -05:00
fec.h	freescale: Move the Freescale drivers	2011-08-12 00:22:12 -07: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	gianfar: Use kmemdup rather than duplicating its implementation	2011-11-21 15:02:36 -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	freescale: Move the Freescale drivers	2011-08-12 00:22:12 -07:00
gianfar.c	net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver()	2011-11-29 00:25:05 -05:00
gianfar.h	ethernet: Convert MAC_ADDR_LEN uses to ETH_ALEN	2011-11-16 20:23:17 -05:00
Kconfig	net/fec: make FEC driver buildable as module	2011-12-08 19:51:30 -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	ucc_geth: Convert ENET_NUM_OCTETS_PER_ADDRESS uses to ETH_ALEN	2011-11-16 20:23:18 -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