David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/batman-adv/bridge_loop_avoidance.c net/batman-adv/bridge_loop_avoidance.h net/batman-adv/soft-interface.c net/mac80211/mlme.c With merge help from Antonio Quartulli (batman-adv) and Stephen Rothwell (drivers/net/usb/qmi_wwan.c). The net/mac80211/mlme.c conflict seemed easy enough, accounting for a conversion to some new tracing macros. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-07-10 23:56:33 -07:00
..
fs_enet	fs_enet: Support the get_ts_info ethtool method.	2012-04-04 05:28:47 -04: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
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	net/fsl_pq_mdio: use spin_event_timeout() to poll the indicator register	2012-07-09 15:15:34 -07:00
fsl_pq_mdio.h
gianfar.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -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