git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f6878b 054d5c9)
Merge branches 'master' and 'devel' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 10 Aug 2010 22:17:52 +0000 (23:17 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 10 Aug 2010 22:17:52 +0000 (23:17 +0100)
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig


Trivial merge
Pandora Kernel Repository