git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f000631 faf64ed)
Merge branch 'pxa' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 13 Jul 2008 11:05:49 +0000 (12:05 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 13 Jul 2008 11:05:49 +0000 (12:05 +0100)
Conflicts:

arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig


Trivial merge
Pandora Kernel Repository