| commit | 7d78c887a94067ba218dc71b89d0d7a09415197f | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Thu Nov 17 15:47:30 2005 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Nov 17 15:47:30 2005 +0000 |
| tree | ff87df902888694cada5173e91edeee6119a8d7e | |
| parent | 0db169f9703115bab09eda5d89a8f6937a7bf98e [diff] |
[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>