diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-10-31 08:59:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-31 08:59:27 -0400 |
| commit | d8e4aa070751bfd646b8692cc12b0ee7e55d3266 (patch) | |
| tree | 1056644953faf55e8b0d75c49f2ce79f958a825b /net/socket.c | |
| parent | Merge tag 'shared-for-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma (diff) | |
| download | linux-rng-d8e4aa070751bfd646b8692cc12b0ee7e55d3266.tar.xz linux-rng-d8e4aa070751bfd646b8692cc12b0ee7e55d3266.zip | |
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>
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions