git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc8cc67
)
net: stmmac: fix bad merge conflict resolution
author
Olof Johansson
<olof@lixom.net>
Fri, 6 Sep 2013 01:01:41 +0000
(18:01 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 6 Sep 2013 01:07:00 +0000
(18:07 -0700)
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>
No differences found