]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a09bcba) | 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)
commita7115c3a4bf9f869f030e896e209836daa0ea034
tree6990b05cd4d75578998d48cab4af4334140b5eb8tree | snapshot
parenta09bcbaa3c32a63ae79431c85962dbbf72871e72commit | 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 | history
Linux Kernel Source Tree.