git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f95416 28bd3a0)
Merge branch 'ixp4xx' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 6 May 2007 19:58:29 +0000 (20:58 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 May 2007 19:58:29 +0000 (20:58 +0100)
Conflicts:

include/asm-arm/arch-ixp4xx/io.h


Trivial merge
Pandora Kernel Repository