leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1d962ecf1e
linux/drivers/net/ethernet/stmicro/stmmac
History
David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-07-10 23:56:33 -07:00
..
chain_mode.c
common.h stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
descs_com.h
descs.h
dwmac100_core.c stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
dwmac100_dma.c stmmac: add mixed burst for DMA 2012-05-14 18:53:19 -04:00
dwmac100.h
dwmac1000_core.c stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
dwmac1000_dma.c stmmac: add mixed burst for DMA 2012-05-14 18:53:19 -04:00
dwmac1000.h stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
dwmac_dma.h stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
dwmac_lib.c stmmac: extend mac addr reg and fix perfect filering 2012-05-14 18:53:19 -04:00
enh_desc.c stmmac: sanitize the rx coe and add the type-1 csum (v2) 2012-04-04 18:39:23 -04:00
Kconfig stmmac: fix driver built w/ w/o both pci and platf modules 2012-06-07 22:46:48 -07:00
Makefile stmmac: add the experimental PCI support 2011-12-21 15:44:34 -05:00
mmc_core.c stmmac: Fix compilation error in mmc_core.c 2012-01-10 14:57:20 -08:00
mmc.h
norm_desc.c stmmac: sanitize the rx coe and add the type-1 csum (v2) 2012-04-04 18:39:23 -04:00
ring_mode.c stmmac: Fix for higher mtu size handling 2012-07-09 14:37:52 -07:00
stmmac_ethtool.c stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
stmmac_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-10 23:56:33 -07:00
stmmac_mdio.c stmmac: MDC clock dynamically based on the csr clock input 2012-04-04 18:39:24 -04:00
stmmac_pci.c drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions 2012-07-10 23:13:46 -07:00
stmmac_platform.c stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
stmmac_timer.c
stmmac_timer.h
stmmac.h stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00