]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5f69dc4) | 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)
commit6e66eca47f4ae221216d464571ab5507f1ec6f44
tree46c0479e0a19b1be15e872a5d25182e3f160e274tree | snapshot
parent5f69dc4bdd5a01f635faf66919e004b29856e931commit | diff
net: stmmac: fix bad merge conflict resolution

Merge commit 182f0fca16e7 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
Linux Kernel Source Tree.