David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-10 18:32:51 -05: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_ptp.c	net: fec: reduce spin lock time in fec_ptp_adjfreq	2012-11-07 18:52:12 -05:00
fec.c	FEC: Add time stamping code and a PTP hardware clock	2012-11-01 12:28:44 -04:00
fec.h	FEC: Add time stamping code and a PTP hardware clock	2012-11-01 12:28:44 -04: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	gianfar_ptp: use iomem, not ioports resource tree in probe	2012-10-24 23:18:59 -04:00
gianfar_sysfs.c	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
gianfar.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
gianfar.h	net: remove skb recycling	2012-10-07 00:40:54 -04:00
Kconfig	net: fec: default select FEC_PTP at mx6 platform	2012-11-07 18:52:12 -05:00
Makefile	FEC: Add time stamping code and a PTP hardware clock	2012-11-01 12:28:44 -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: fix typo in freescale/ucc_geth.c	2012-10-09 00:21:38 -04:00
ucc_geth.h	net: remove skb recycling	2012-10-07 00:40:54 -04:00
xgmac_mdio.c	net/fsl: introduce Freescale 10G MDIO driver	2012-08-24 12:42:42 -04:00