git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59136ef 4c5f830)
Merge branch 'restart-cleanup' into restart
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 12:56:44 +0000 (12:56 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 12:56:44 +0000 (12:56 +0000)
Conflicts:
arch/arm/kernel/setup.c


Trivial merge
Pandora Kernel Repository