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
..
stmmac	net: stmmac: fix bad merge conflict resolution	2013-09-05 18:07:00 -07:00
Kconfig	drivers/net/ethernet/*: Enabled vendor Kconfig options	2011-08-27 00:58:56 -07:00
Makefile	stmmac: Move the STMicroelectronics driver	2011-08-11 16:29:01 -07:00