git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e902be5 635f025)
Merge branch 'clps7500' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 27 Nov 2008 12:39:43 +0000 (12:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 27 Nov 2008 12:39:43 +0000 (12:39 +0000)
Conflicts:

arch/arm/Kconfig


Trivial merge
Pandora Kernel Repository