| commit | 5cd47155155a32e5b944ac9fc3f3dc578e429aa0 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Sun May 06 20:58:29 2007 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sun May 06 20:58:29 2007 +0100 |
| tree | ea05bfdbae04eb5ffbafa2c58fc68897a3f541d6 | |
| parent | 6f95416ebe81b3ad63884538555efb81cb05749f [diff] | |
| parent | 28bd3a0dcce11bea6f99a351cc64053dff00196e [diff] |
Merge branch 'ixp4xx' into devel Conflicts: include/asm-arm/arch-ixp4xx/io.h