git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a177ba3 1bd55a4)
Merge branch 'imx' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 10 Jul 2008 15:41:50 +0000 (16:41 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 10 Jul 2008 15:41:50 +0000 (16:41 +0100)
Conflicts:

arch/arm/mm/Kconfig


Trivial merge
Pandora Kernel Repository