leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dda922c831
linux/drivers/net/ethernet/stmicro/stmmac
History
David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-01 22:51:30 -07:00
..
chain_mode.c stmmac: fix dma api misuse 2014-08-29 19:54:36 -07:00
common.h stmmac: Configure Flow Control to work correctly based on rxfifo size 2015-04-16 13:58:42 -04:00
descs_com.h stmmac: code tidy-up 2013-04-08 16:55:27 -04:00
descs.h stmmac: code tidy-up 2013-04-08 16:55:27 -04:00
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 stmmac: Configure Flow Control to work correctly based on rxfifo size 2015-04-16 13:58:42 -04:00
dwmac100.h
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
dwmac1000.h stmmac: Add defines and documentation for enabling flow control 2015-04-16 13:58:42 -04:00
dwmac_dma.h stmicro: Remove extern from function prototypes 2013-09-24 12:54:08 -07:00
dwmac_lib.c stmmac: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
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: convert dwmac-lpc18xx to a platform driver 2015-05-15 12:44:22 -04:00
dwmac-meson.c stmmac: convert dwmac-meson to platform driver 2015-05-15 12:44:22 -04:00
dwmac-rk.c stmmac: convert dwmac-rk to platform driver 2015-05-15 12:44:22 -04: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
enh_desc.c net: stmmac: Correct duplicate if/then/else case found by cppcheck 2014-07-02 18:37:54 -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_core.c stmmac: fix tipo on mmc crc error 2014-08-29 19:54:36 -07:00
mmc.h stmmac: fix tipo on mmc crc error 2014-08-29 19:54:36 -07:00
norm_desc.c stmmac: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
ring_mode.c stmmac: fix dma api misuse 2014-08-29 19:54:36 -07:00
stmmac_ethtool.c stmmac: fix max coal timer parameter 2014-12-09 13:25:18 -05:00
stmmac_hwtstamp.c driver:stmmac: Adjust time stamp increase for 0.465 ns accurate only when Time stamp binary rollover is set. 2013-09-04 14:37:02 -04:00
stmmac_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07: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: change the stmmac_dvr_probe return type to int 2015-05-21 18:57:26 -04:00
stmmac_platform.c stmmac: add fixed-link device-tree support 2015-05-30 17:04:36 -07:00
stmmac_platform.h stmmac: convert dwmac-sunxi to platform driver 2015-05-15 12:44:23 -04:00
stmmac_ptp.c ptp: stmmac: use helpers for converting ns to timespec. 2015-03-31 17:19:19 -04:00
stmmac_ptp.h stmmac: ptp: fix the reference clock 2014-08-29 19:54:36 -07:00
stmmac.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07:00