leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
fcf752ae19c1a79e90b8613ffb51c845594e3692
linux/drivers/net/ethernet/stmicro/stmmac
History
David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-07-06 10:35:22 -07:00
..
chain_mode.c
stmmac: optimize tx desc management
2016-03-02 14:21:32 -05:00
common.h
drivers: net: stmmac: add port selection programming
2016-06-28 08:54:23 -04:00
descs_com.h
stmmac: change descriptor layout
2016-03-02 14:21:30 -05:00
descs.h
stmmac: change descriptor layout
2016-03-02 14:21:30 -05:00
dwmac4_core.c
drivers: net: stmmac: add port selection programming
2016-06-28 08:54:23 -04:00
dwmac4_descs.c
net: ethernet: stmmac: GMAC4.xx: Fix TX descriptor preparation
2016-04-13 22:35:17 -04:00
dwmac4_descs.h
stmmac: add descriptors function for GMAC 4.xx
2016-04-02 20:23:07 -04:00
dwmac4_dma.c
stmmac: add DMA support for GMAC 4.xx
2016-04-02 20:23:08 -04:00
dwmac4_dma.h
stmmac: add DMA support for GMAC 4.xx
2016-04-02 20:23:08 -04:00
dwmac4_lib.c
stmmac: add DMA support for GMAC 4.xx
2016-04-02 20:23:08 -04:00
dwmac4.h
drivers: net: stmmac: rework core ISR to better manage PCS and PMT
2016-06-28 08:54:23 -04:00
dwmac100_core.c
stmmac: rework synopsys id read, moved to dwmac setup
2016-04-02 20:23:07 -04:00
dwmac100_dma.c
stmmac: rework DMA bus setting and introduce new platform AXI structure
2016-03-02 14:21:30 -05:00
dwmac100.h
stmmac: share reset function between dwmac100 and dwmac1000
2016-03-02 14:21:30 -05:00
dwmac1000_core.c
drivers: net: stmmac: add port selection programming
2016-06-28 08:54:23 -04:00
dwmac1000_dma.c
stmmac: rework get_hw_feature function
2016-04-02 20:23:07 -04:00
dwmac1000.h
drivers: net: stmmac: rework core ISR to better manage PCS and PMT
2016-06-28 08:54:23 -04:00
dwmac_dma.h
stmmac: rework DMA bus setting and introduce new platform AXI structure
2016-03-02 14:21:30 -05:00
dwmac_lib.c
stmmac: share reset function between dwmac100 and dwmac1000
2016-03-02 14:21:30 -05:00
dwmac-generic.c
stmmac: remove setup/free glue callbacks
2015-07-29 00:13:25 -07:00
dwmac-ipq806x.c
stmmac: ipq806x: Return error values instead of pointers
2015-12-03 15:24:42 -05: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 rk3228-specific data
2016-06-26 15:45:39 -04:00
dwmac-socfpga.c
stmmac: dwmac-socfpga: make socfpga_dwmac_pm_ops static
2016-05-09 22:39:59 -04:00
dwmac-sti.c
stmmac: dwmac-sti: fix st,tx-retime-src check
2015-11-30 14:52:51 -05:00
dwmac-sunxi.c
stmmac: dwmac-sunxi: Call exit cleanup function in probe error path
2015-12-14 16:11:59 -05:00
enh_desc.c
stmmac: rework the routines to show the ring status
2016-04-02 20:23:07 -04:00
Kconfig
stmmac: make platform drivers depend on their associated SoC
2016-06-01 21:44:52 -07:00
Makefile
stmmac: add GMAC4 core support
2016-04-02 20:23:08 -04:00
mmc_core.c
stmmac: enhance mmc counter management
2016-04-02 20:23:08 -04:00
mmc.h
stmmac: enhance mmc counter management
2016-04-02 20:23:08 -04:00
norm_desc.c
stmmac: rework the routines to show the ring status
2016-04-02 20:23:07 -04:00
ring_mode.c
stmmac: first frame prep at the end of xmit routine
2016-03-02 14:21:33 -05:00
stmmac_ethtool.c
drivers: net: stmmac: add port selection programming
2016-06-28 08:54:23 -04:00
stmmac_hwtstamp.c
stmmac: Fix calculations for ptp counters when clock input = 50Mhz.
2015-12-15 23:20:56 -05:00
stmmac_main.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-07-06 10:35:22 -07:00
stmmac_mdio.c
net: stmmac: Fix incorrect memcpy source memory
2016-05-25 21:43:35 -07:00
stmmac_pci.c
stmmac: let remove/resume/suspend functions take device pointer
2016-05-03 15:22:19 -04:00
stmmac_pcs.h
drivers: net: stmmac: reworking the PCS code.
2016-06-28 08:54:23 -04:00
stmmac_platform.c
drivers: net: stmmac: add port selection programming
2016-06-28 08:54:23 -04:00
stmmac_platform.h
stmmac: move stmmac_pltfr_probe into dwmac-generic
2015-07-29 00:13:24 -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
stmmac: ptp: fix the reference clock
2014-08-29 19:54:36 -07:00
stmmac.h
drivers: net: stmmac: rework core ISR to better manage PCS and PMT
2016-06-28 08:54:23 -04:00