projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d8e4aa0) | patch
mv643xx_eth: Properly resolve merge conflict.
authorDavid S. Miller <davem@davemloft.net>
Mon, 31 Oct 2016 14:33:08 +0000 (10:33 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 Oct 2016 14:33:08 +0000 (10:33 -0400)
commit2a43ca0aa9084c41aaa1006fbf22155b2e94babf
tree6990b05cd4d75578998d48cab4af4334140b5eb8tree | snapshot (tar.gz zip)
parentd8e4aa070751bfd646b8692cc12b0ee7e55d3266commit | diff
mv643xx_eth: Properly resolve merge conflict.

The second SET_NETDEV_DEV() in the hunk should be
removed.

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 | blame | history
Motorola kernel-slsi