git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 946342d 008ca43)
Merge branch 'cleanup' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 May 2013 20:31:29 +0000 (21:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 May 2013 20:31:29 +0000 (21:31 +0100)
Conflicts:
arch/arm/plat-omap/dmtimer.c


Trivial merge
Pandora Kernel Repository