David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-01 17:06:14 -04:00
..
fs_enet	fs_enet: cleanup clock API use	2013-08-22 22:13:54 -07:00
fec_main.c	net: fec: remove deprecated IRQF_DISABLED	2013-09-15 22:01:05 -04: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
fec_ptp.c	fec: Only pass pdev in fec_ptp_init()	2013-06-07 14:41:07 -07:00
fec.h	net: fec: fix the error to get the previous BD entry	2013-09-04 14:14:54 -04:00
fsl_pq_mdio.c	net: fsl_pq_mdio: remove unnecessary dev_set_drvdata()	2013-08-21 12:27:04 -07:00
gianfar_ethtool.c	gianfar: Add flow control support	2013-08-13 15:28:53 -07:00
gianfar_ptp.c	powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file	2013-09-30 21:17:16 -07:00
gianfar_sysfs.c	gianfar: Use netdev_<level> when possible	2013-04-14 15:41:49 -04:00
gianfar.c	gianfar: Fix reported number of sent bytes to BQL	2013-09-03 22:14:28 -04:00
gianfar.h	gianfar: Remove extern from function prototypes	2013-09-24 10:09:27 -04:00
Kconfig	NET: FEC: dynamtic check DMA desc buff type	2013-01-04 15:15:39 -08:00
Makefile	net: fec: build fec.c and fec_ptp.c to one module	2013-03-25 12:14:57 -04:00
ucc_geth_ethtool.c	ucc_geth: Convert ugeth_<level> to pr_<level>	2013-04-14 15:41:49 -04:00
ucc_geth.c	net: ucc_geth: remove unnecessary dev_set_drvdata()	2013-08-21 12:27:04 -07:00
ucc_geth.h	net: remove skb recycling	2012-10-07 00:40:54 -04:00
xgmac_mdio.c	net: ethernet: use platform_{get,set}_drvdata()	2013-05-25 21:27:58 -07:00