linux/drivers/net/ethernet/stmicro/stmmac
David S. Miller 3cef5c5b0b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/cadence/macb.c

Overlapping changes in macb driver, mostly fixes and cleanups
in 'net' overlapping with the integration of at91_ether into
macb in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-09 23:38:02 -04:00
..
chain_mode.c stmmac: fix dma api misuse 2014-08-29 19:54:36 -07:00
common.h stmmac: document common header file 2014-11-19 15:04:57 -05: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: correct mc_filter local variable in set_filter and set_mac_addr call 2014-10-10 14:48:02 -04:00
dwmac1000_dma.c stmmac: remove BUS_MODE_DA 2014-11-05 16:14:43 -05: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 stmmac: platform: fix sparse warnings 2014-11-07 12:25:23 -05:00
dwmac-rk.c net: stmmac: dwmac-rk: Use standard devicetree property for phy regulator 2015-01-24 17:17:07 -08:00
dwmac-socfpga.c net: stmmac: make reset control an optional requirement 2015-03-08 22:52:45 -04:00
dwmac-sti.c stmmac: dwmac-sti: Pass sysconfig register offset via syscon dt property. 2015-01-11 18:53:34 -05:00
dwmac-sunxi.c stmmac: review driver when run kernel-doc 2014-11-19 15:04:58 -05: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: split to core library and probe drivers 2014-11-11 14:34:39 -05:00
Makefile GMAC: add driver for Rockchip RK3288 SoCs integrated GMAC 2014-12-31 19:14:05 -05: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 ethernet: codespell comment spelling fixes 2015-03-08 22:54:22 -04: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: pci: add MSI support for Intel Quark X1000 2015-01-27 21:08:08 -08:00
stmmac_platform.c stmmac: check IRQ availability early on probe 2015-03-04 15:43:26 -05:00
stmmac_platform.h GMAC: add driver for Rockchip RK3288 SoCs integrated GMAC 2014-12-31 19:14:05 -05: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 stmmac: split to core library and probe drivers 2014-11-11 14:34:39 -05:00