Skip to content
Commit 7d78c887 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0db169f9
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