| commit | 988addf82e4c03739375279de73929580a2d4a6a | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Mar 08 20:21:04 2010 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Mar 08 20:21:04 2010 +0000 |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 [diff] | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 [diff] |
Merge branch 'origin' into devel-stable Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c