| commit | 356f9e74ffaafd11741589a9aa21d6c9d2721417 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Thu Sep 05 18:01:41 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 05 18:07:00 2013 -0700 |
| tree | 46c0479e0a19b1be15e872a5d25182e3f160e274 | |
| parent | fc8cc67787baf9a4cb00d3a1e8d1fe8c878f538a [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>