David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/s390/net/bpf_jit_comp.c drivers/net/ethernet/ti/netcp_ethss.c net/bridge/br_multicast.c net/ipv4/ip_fragment.c All four conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-07-31 23:52:20 -07:00
..
chain_mode.c
common.h
descs.h	stmmac: troubleshoot unexpected bits in des0 & des1	2015-06-24 02:38:53 -07:00
descs_com.h
dwmac-generic.c	stmmac: remove setup/free glue callbacks	2015-07-29 00:13:25 -07:00
dwmac-ipq806x.c	stmmac: dwmac-ipq806x: turn setup callback into a probe function	2015-07-29 00:13:22 -07:00
dwmac-lpc18xx.c	stmmac: add proper probe function to dwmac-lpc18xx	2015-07-20 20:45:57 -07:00
dwmac-meson.c	stmmac: add proper probe function to dwmac-meson	2015-07-20 20:45:57 -07:00
dwmac-rk.c	stmmac: dwmac-rk: use rk_gmac_ops as of match data	2015-07-29 00:13:24 -07:00
dwmac-socfpga.c	stmmac: dwmac-socfpga: turn setup callback into a probe function	2015-07-29 00:13:23 -07:00
dwmac-sti.c	stmmac: dwmac-sti: refactor the init glue callbacks	2015-07-29 00:13:25 -07:00
dwmac-sunxi.c	stmmac: dwmac-sunxi: turn setup callback into a probe function	2015-07-29 00:13:23 -07:00
dwmac100.h
dwmac100_core.c
dwmac100_dma.c
dwmac1000.h
dwmac1000_core.c
dwmac1000_dma.c
dwmac_dma.h
dwmac_lib.c
enh_desc.c	stmmac: troubleshoot unexpected bits in des0 & des1	2015-06-24 02:38:53 -07:00
Kconfig	stmmac: add ipq806x glue layer	2015-05-30 17:04:36 -07:00
Makefile	stmmac: add ipq806x glue layer	2015-05-30 17:04:36 -07:00
mmc.h
mmc_core.c	stmmac: Trivial: fix typo in constant name	2015-06-29 12:45:04 -07:00
norm_desc.c	stmmac: troubleshoot unexpected bits in des0 & des1	2015-06-24 02:38:53 -07:00
ring_mode.c
stmmac.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
stmmac_ethtool.c
stmmac_hwtstamp.c
stmmac_main.c	stmmac: fix setting of driver data in stmmac_dvr_probe	2015-07-21 00:26:45 -07:00
stmmac_mdio.c
stmmac_pci.c	stmmac: change the stmmac_dvr_probe return type to int	2015-05-21 18:57:26 -04:00
stmmac_platform.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
stmmac_platform.h	stmmac: move stmmac_pltfr_probe into dwmac-generic	2015-07-29 00:13:24 -07:00
stmmac_ptp.c
stmmac_ptp.h