git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 004c1c7 25cf84c)
Merge branch 'origin' into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 8 Mar 2010 20:21:04 +0000 (20:21 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 8 Mar 2010 20:21:04 +0000 (20:21 +0000)
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c


Trivial merge
Pandora Kernel Repository