Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net: stmmac: fix bad merge conflict resolution
Merge commit 06c5405 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>
- Loading branch information