git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4d9959 b3aa111)
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Apr 2010 09:47:05 +0000 (10:47 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Apr 2010 09:47:05 +0000 (10:47 +0100)
Conflicts:
arch/arm/mach-mx3/mach-pcm037.c


Trivial merge
Pandora Kernel Repository