David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -07:00
..
fs_enet	fs_enet: Support the get_ts_info ethtool method.	2012-04-04 05:28:47 -04:00
fec.c	net: fec: add phy-reset-duration for device tree probe	2012-06-27 21:22:06 -07:00
fec.h	net: fsl: fec: handle 10Mbps speed in RMII mode	2012-01-12 20:05:28 -08:00
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_mpc52xx_phy.c
fsl_pq_mdio.c	Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.	2012-04-01 16:47:12 -04:00
fsl_pq_mdio.h
gianfar.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
gianfar.h	gianfar: Support the get_ts_info ethtool method.	2012-04-04 05:28:45 -04:00
gianfar_ethtool.c	gianfar_ethtool: coding style and whitespace cleanups	2012-06-05 15:38:40 -07:00
gianfar_ptp.c	gianfar: Support the get_ts_info ethtool method.	2012-04-04 05:28:45 -04:00
gianfar_sysfs.c	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
ucc_geth.c	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
ucc_geth.h	net: ucc_geth, increase no. of HW RX descriptors	2012-05-02 20:09:04 -04:00
ucc_geth_ethtool.c	ucc_geth: Support the get_ts_info ethtool method.	2012-04-04 05:28:48 -04:00