David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/amd/xgbe/xgbe-desc.c drivers/net/ethernet/renesas/sh_eth.c Overlapping changes in both conflict cases. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-12-10 15:48:20 -05:00
..
chain_mode.c	stmmac: fix dma api misuse	2014-08-29 19:54:36 -07:00
common.h	stmmac: document common header file	2014-11-19 15:04:57 -05:00
descs.h
descs_com.h
dwmac-meson.c	stmmac: platform: fix sparse warnings	2014-11-07 12:25:23 -05:00
dwmac-socfpga.c	stmmac: platform: fix sparse warnings	2014-11-07 12:25:23 -05:00
dwmac-sti.c	stmmac: review driver when run kernel-doc	2014-11-19 15:04:58 -05:00
dwmac-sunxi.c	stmmac: review driver when run kernel-doc	2014-11-19 15:04:58 -05:00
dwmac100.h
dwmac100_core.c	net: stmmac: Support devicetree configs for mcast and ucast filter entries	2014-07-31 14:13:29 -07:00
dwmac100_dma.c
dwmac1000.h	stmmac: prevent false carrier sense detection	2014-08-29 19:54:36 -07:00
dwmac1000_core.c	stmmac: correct mc_filter local variable in set_filter and set_mac_addr call	2014-10-10 14:48:02 -04:00
dwmac1000_dma.c	stmmac: remove BUS_MODE_DA	2014-11-05 16:14:43 -05:00
dwmac_dma.h
dwmac_lib.c
enh_desc.c	net: stmmac: Correct duplicate if/then/else case found by cppcheck	2014-07-02 18:37:54 -07:00
Kconfig	stmmac: split to core library and probe drivers	2014-11-11 14:34:39 -05:00
Makefile	stmmac: split to core library and probe drivers	2014-11-11 14:34:39 -05:00
mmc.h	stmmac: fix tipo on mmc crc error	2014-08-29 19:54:36 -07:00
mmc_core.c	stmmac: fix tipo on mmc crc error	2014-08-29 19:54:36 -07:00
norm_desc.c
ring_mode.c	stmmac: fix dma api misuse	2014-08-29 19:54:36 -07:00
stmmac.h	stmmac: split to core library and probe drivers	2014-11-11 14:34:39 -05:00
stmmac_ethtool.c	stmmac: fix max coal timer parameter	2014-12-09 13:25:18 -05:00
stmmac_hwtstamp.c
stmmac_main.c	stmmac: review driver when run kernel-doc	2014-11-19 15:04:58 -05:00
stmmac_mdio.c	drivers/net: Convert remaining uses of pr_warning to pr_warn	2014-09-09 20:37:08 -07:00
stmmac_pci.c	stmmac: pci: allocate memory resources dynamically	2014-12-05 21:03:48 -08:00
stmmac_platform.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
stmmac_platform.h	stmmac: platform: fix sparse warnings	2014-11-07 12:25:23 -05:00
stmmac_ptp.c	stmmac: set ptp_clock to NULL while unregister	2014-08-25 15:33:10 -07:00
stmmac_ptp.h	stmmac: ptp: fix the reference clock	2014-08-29 19:54:36 -07:00