David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
fs_enet	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
fec_main.c	net: fec: fix potential issue to avoid fec interrupt lost and crc error	2014-02-20 13:16:13 -05:00
fec_mpc52xx_phy.c	net: fec_mpc52xx_phy: remove unnecessary dev_set_drvdata()	2013-08-21 12:27:04 -07:00
fec_mpc52xx.c	net: ethernet: use platform_{get,set}_drvdata()	2013-05-25 21:27:58 -07:00
fec_mpc52xx.h	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
fec_ptp.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
fec.h	fec: Implement the SIOCGHWTSTAMP ioctl	2013-11-21 17:17:37 +00:00
fsl_pq_mdio.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
gianfar_ethtool.c	gianfar: Fix Tx int miss, dont write IC on-the-fly	2014-02-24 19:38:20 -05:00
gianfar_ptp.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
gianfar.c	gianfar: Fix Tx int miss, dont write IC on-the-fly	2014-02-24 19:38:20 -05:00
gianfar.h	gianfar: Fix device reset races (oops) for Tx	2014-02-24 19:38:20 -05:00
Kconfig	NET: FEC: dynamtic check DMA desc buff type	2013-01-04 15:15:39 -08:00
Makefile	gianfar: Remove sysfs stubs for FIFOCFG and stashing	2014-02-18 15:03:02 -05:00
ucc_geth_ethtool.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
ucc_geth.c	net: freescale: remove unused compare_addr()	2013-12-26 13:31:32 -05:00
ucc_geth.h	net: remove skb recycling	2012-10-07 00:40:54 -04:00
xgmac_mdio.c	drivers: clean-up prom.h implicit includes	2013-10-09 20:04:04 -05:00