diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-31 10:33:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-31 10:33:08 -0400 |
| commit | 2a43ca0aa9084c41aaa1006fbf22155b2e94babf (patch) | |
| tree | 6990b05cd4d75578998d48cab4af4334140b5eb8 /net/socket.c | |
| parent | d8e4aa070751bfd646b8692cc12b0ee7e55d3266 (diff) | |
| download | linux-2a43ca0aa9084c41aaa1006fbf22155b2e94babf.tar.gz linux-2a43ca0aa9084c41aaa1006fbf22155b2e94babf.tar.bz2 linux-2a43ca0aa9084c41aaa1006fbf22155b2e94babf.zip | |
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>
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions