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

ucc_geth: Fix merge error. 



I left a merge failure unresolved, noticed by Stephen
Rothwell.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18f27383
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment