git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23beab7 865a4fa)
Merge branch 'hotplug' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Oct 2010 21:34:47 +0000 (22:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Oct 2010 21:34:47 +0000 (22:34 +0100)
Conflicts:
arch/arm/kernel/head-common.S


Trivial merge
Pandora Kernel Repository