git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8b374b 839e642)
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 26 Mar 2009 23:10:11 +0000 (23:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 26 Mar 2009 23:10:11 +0000 (23:10 +0000)
Conflicts:
arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Trivial merge
Pandora Kernel Repository