Olof Johansson 356f9e74ff net: stmmac: fix bad merge conflict resolution ... Merge commit 06c54055be did a bad conflict resolution accidentally leaving out a closing brace. Add it back. This breaks a handful of defconfigs on ARM, so it'd be good to see it applied pretty quickly. Signed-off-by: Olof Johansson <olof@lixom.net> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2013-09-05 18:07:00 -07:00
..
Kconfig	net: Move MII out from under NET_CORE and hide it	2013-06-19 22:22:56 -07:00
Makefile	stmmac: add the support for PTP hw clock driver	2013-03-26 12:53:37 -04:00
chain_mode.c	stmmac: code tidy-up	2013-04-08 16:55:27 -04:00
common.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-03 14:55:13 -07:00
descs.h	stmmac: code tidy-up	2013-04-08 16:55:27 -04:00
descs_com.h	stmmac: code tidy-up	2013-04-08 16:55:27 -04:00
dwmac100.h	stmmac: add header inclusion protection	2012-08-24 13:25:05 -04:00
dwmac100_core.c	stmmac: dity-up and rework the driver debug levels	2013-07-02 16:04:53 -07:00
dwmac100_dma.c	stmmac: dity-up and rework the driver debug levels	2013-07-02 16:04:53 -07:00
dwmac1000.h	stmmac: code tidy-up	2013-04-08 16:55:27 -04:00
dwmac1000_core.c	stmmac: dity-up and rework the driver debug levels	2013-07-02 16:04:53 -07:00
dwmac1000_dma.c	stmmac: dity-up and rework the driver debug levels	2013-07-02 16:04:53 -07:00
dwmac_dma.h	stmmac: code tidy-up	2013-04-08 16:55:27 -04:00
dwmac_lib.c	stmmac: dity-up and rework the driver debug levels	2013-07-02 16:04:53 -07:00
enh_desc.c	stmmac: dity-up and rework the driver debug levels	2013-07-02 16:04:53 -07:00
mmc.h	stmmac: code tidy-up	2013-04-08 16:55:27 -04:00
mmc_core.c	stmmac: prevent interrupt loop with MMC RX IPC Counter	2013-04-11 16:03:22 -04:00
norm_desc.c	stmmac: dity-up and rework the driver debug levels	2013-07-02 16:04:53 -07:00
ring_mode.c	net: stmmac: Fixed the condition of extend_desc for jumbo frame	2013-08-09 13:44:31 -07:00
stmmac.h	stmmac: remove useless csum flag	2013-08-21 20:38:16 -07:00
stmmac_ethtool.c	stmmac: add the support for PTP hw clock driver	2013-03-26 12:53:37 -04: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	driver:net:stmmac: Disable DMA store and forward mode if platform data force_thresh_dma_mode is set.	2013-08-30 17:26:09 -04:00
stmmac_mdio.c	dt:net:stmmac: Add dt specific phy reset callback support.	2013-07-04 14:34:17 -07:00
stmmac_pci.c	stmmac: code tidy-up	2013-04-08 16:55:27 -04:00
stmmac_platform.c	net: stmmac: fix bad merge conflict resolution	2013-09-05 18:07:00 -07:00
stmmac_ptp.c	stmmac: improve/review and fix kernel-doc	2013-04-08 16:55:27 -04:00
stmmac_ptp.h	stmmac: add IEEE PTPv1 and PTPv2 support.	2013-03-26 12:53:37 -04:00