git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bfe99a d01cd63)
Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 24 May 2010 19:34:20 +0000 (20:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 24 May 2010 22:08:36 +0000 (23:08 +0100)
Conflicts:
arch/arm/Kconfig


Trivial merge
Pandora Kernel Repository