| commit | e4862f2f6f5653dfb67f3ba2b6f0bc74516ed51a | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Aug 16 18:42:58 2010 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Aug 16 18:42:58 2010 +0100 |
| tree | 1db5a0540a4eecfad9b7daee476b985e82ddc810 | |
| parent | ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1 [diff] | |
| parent | b2c1e07b81a126e5846dfc3d36f559d861df59f4 [diff] |
Merge branch 'for-2.6.36' into for-2.6.37 Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename. Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c