]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0a6ce1e) | patch
mv643xx_eth: Fix merge error.
authorDavid S. Miller <davem@davemloft.net>
Mon, 31 Oct 2016 12:59:27 +0000 (08:59 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 Oct 2016 12:59:27 +0000 (08:59 -0400)
commitd8e4aa070751bfd646b8692cc12b0ee7e55d3266
tree1056644953faf55e8b0d75c49f2ce79f958a825btree | snapshot
parent0a6ce1e3c1ab71c7b889fae3359c9c3ff3a43aabcommit | diff
mv643xx_eth: Fix merge error.

One merge conflict block wasn't resolved.

Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/mv643xx_eth.c diff | blob | history
Beck SC1x5 Kernel