Skip to content
Commit d8e4aa07 authored by David S. Miller's avatar David S. Miller
Browse files

mv643xx_eth: Fix merge error. 



One merge conflict block wasn't resolved.

Reported-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a6ce1e3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment