Merge branch 'for-2.6.36' into for-2.6.37
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 16 Aug 2010 17:42:58 +0000 (18:42 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 16 Aug 2010 17:42:58 +0000 (18:42 +0100)
commite4862f2f6f5653dfb67f3ba2b6f0bc74516ed51a
tree1db5a0540a4eecfad9b7daee476b985e82ddc810
parentec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1
parentb2c1e07b81a126e5846dfc3d36f559d861df59f4
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
24 files changed:
arch/arm/mach-ep93xx/core.c
arch/arm/mach-kirkwood/common.c
arch/arm/mach-mx3/clock-imx35.c
arch/arm/mach-mx3/devices.c
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-zoom2.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/include/mach/board-zoom.h
arch/arm/mach-pxa/devices.c
arch/arm/mach-pxa/devices.h
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-s3c64xx/dev-audio.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/plat-mxc/audmux-v2.c
arch/arm/plat-samsung/include/plat/devs.h
sound/soc/codecs/wm8776.c
sound/soc/fsl/mpc5200_dma.h
sound/soc/fsl/mpc5200_psc_ac97.c
sound/soc/fsl/mpc5200_psc_i2s.c
sound/soc/imx/imx-ssi.c
sound/soc/soc-core.c