From: Olof Johansson <olof@lixom.net>
Date: Fri, 6 Sep 2013 01:01:41 +0000 (-0700)
Subject: net: stmmac: fix bad merge conflict resolution
X-Git-Tag: v3.12-rc1~129
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=356f9e74ffaafd11741589a9aa21d6c9d2721417;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed