leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
739e4a758e
linux/drivers/net/ethernet/stmicro/stmmac
History
David S. Miller 739e4a758e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-10-02 11:25:43 -07:00
..
chain_mode.c stmmac: fix dma api misuse 2014-08-29 19:54:36 -07:00
common.h stmmac: fix the rx csum feature 2014-09-01 21:51:29 -07: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: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
dwmac100.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
dwmac1000_core.c stmmac: fix the rx csum feature 2014-09-01 21:51:29 -07:00
dwmac1000_dma.c stmmac: dity-up and rework the driver debug levels 2013-07-02 16:04:53 -07:00
dwmac1000.h stmmac: prevent false carrier sense detection 2014-08-29 19:54:36 -07: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-meson.c net: stmmac: add Amlogic Meson glue layer 2014-09-26 00:12:56 -04:00
dwmac-socfpga.c net: stmmac: fix return value check in socfpga_dwmac_parse_data() 2014-09-13 16:42:47 -04:00
dwmac-sti.c net: stmmac:sti: Add STi SOC glue driver. 2014-02-13 16:25:13 -05:00
dwmac-sunxi.c net: stmmac: sunxi platform extensions for GMAC in Allwinner A20 SoC's 2014-01-19 20:02:41 -08:00
enh_desc.c net: stmmac: Correct duplicate if/then/else case found by cppcheck 2014-07-02 18:37:54 -07:00
Kconfig net: stmmac: add Amlogic Meson glue layer 2014-09-26 00:12:56 -04:00
Makefile net: stmmac: add Amlogic Meson glue layer 2014-09-26 00:12:56 -04: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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-09-07 21:41:53 -07: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 2014-10-02 11:25:43 -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 PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
stmmac_platform.c net: stmmac: add Amlogic Meson glue layer 2014-09-26 00:12:56 -04: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
stmmac.h net: stmmac: add Amlogic Meson glue layer 2014-09-26 00:12:56 -04:00