Star64_linux/drivers/net/ethernet/stmicro/stmmac
David S. Miller c5e40ee287 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/bridge/br_mdb.c

br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-23 00:41:16 -07:00
..
chain_mode.c
common.h stmmac: Configure Flow Control to work correctly based on rxfifo size 2015-04-16 13:58:42 -04:00
descs.h stmmac: troubleshoot unexpected bits in des0 & des1 2015-06-24 02:38:53 -07:00
descs_com.h
dwmac-generic.c stmmac: drop driver from stmmac platform code 2015-05-15 12:44:23 -04:00
dwmac-ipq806x.c stmmac: add ipq806x glue layer 2015-05-30 17:04:36 -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 net: stmmac: dwmac-rk: add rk3368-specific data 2015-06-23 06:49:26 -07:00
dwmac-socfpga.c stmmac: convert dwmac-socfpga to platform driver 2015-05-15 12:44:22 -04:00
dwmac-sti.c stmmac: convert dwmac-sti to platform driver 2015-05-15 12:44:23 -04:00
dwmac-sunxi.c stmmac: convert dwmac-sunxi to platform driver 2015-05-15 12:44:23 -04:00
dwmac100.h
dwmac100_core.c
dwmac100_dma.c stmmac: Configure Flow Control to work correctly based on rxfifo size 2015-04-16 13:58:42 -04:00
dwmac1000.h stmmac: Add defines and documentation for enabling flow control 2015-04-16 13:58:42 -04:00
dwmac1000_core.c stmmac: Enable unicast pause frame detect in GMAC Register 6 2015-04-16 13:58:42 -04:00
dwmac1000_dma.c stmmac: Configure Flow Control to work correctly based on rxfifo size 2015-04-16 13:58:42 -04:00
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: fix max coal timer parameter 2014-12-09 13:25:18 -05:00
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 stmmac: export probe_config_dt() and get_platform_resources() 2015-07-20 20:45:57 -07:00
stmmac_platform.h stmmac: export probe_config_dt() and get_platform_resources() 2015-07-20 20:45:57 -07:00
stmmac_ptp.c ptp: stmmac: use helpers for converting ns to timespec. 2015-03-31 17:19:19 -04:00
stmmac_ptp.h