drivers/net/ethernet/marvell/mv643xx_eth.c · d8e4aa070751bfd646b8692cc12b0ee7e55d3266 · nexedi / linux

David S. Miller authored Oct 31, 2016

One merge conflict block wasn't resolved.
Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

d8e4aa07

mv643xx_eth.c 79.2 KB