projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fc8cc67) | patch
net: stmmac: fix bad merge conflict resolution
authorOlof Johansson <olof@lixom.net>
Fri, 6 Sep 2013 01:01:41 +0000 (18:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Sep 2013 01:07:00 +0000 (18:07 -0700)
commit356f9e74ffaafd11741589a9aa21d6c9d2721417
tree46c0479e0a19b1be15e872a5d25182e3f160e274tree | snapshot
parentfc8cc67787baf9a4cb00d3a1e8d1fe8c878f538acommit | diff
net: stmmac: fix bad merge conflict resolution

Merge commit 06c54055bebf 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>
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c diff | blob | history
John Crispins staging tree