Merge branch 'for-2.6.32' into mxc

Conflicts:
	sound/soc/Makefile

diff --cc sound/soc/Makefile
index 8120b52,4eaf48a..0c5eac0
--- 1/sound/soc/Makefile
--- 2/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@@ -7,6 -7,6 +7,7 @@@ obj-$(CONFIG_SND_SOC)    += au1x
  obj-$(CONFIG_SND_SOC) += blackfin/
  obj-$(CONFIG_SND_SOC) += davinci/
  obj-$(CONFIG_SND_SOC) += fsl/
++obj-$(CONFIG_SND_SOC)   += imx/
  obj-$(CONFIG_SND_SOC) += omap/
  obj-$(CONFIG_SND_SOC) += pxa/
  obj-$(CONFIG_SND_SOC) += s3c24xx/