git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06afb1a eb04745)
Merge branch 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Oct 2011 07:19:59 +0000 (08:19 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Oct 2011 07:19:59 +0000 (08:19 +0100)
Conflicts:
arch/arm/mach-integrator/integrator_ap.c


Trivial merge
Pandora Kernel Repository