git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6825d2 d5120ae)
Merge branch 's3c-move' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 14 Oct 2008 21:24:51 +0000 (22:24 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 14 Oct 2008 21:24:51 +0000 (22:24 +0100)
Conflicts:

arch/arm/mach-versatile/core.c


Trivial merge
Pandora Kernel Repository