Merge branch 'for-2.6.32' into mxc

Conflicts:
	sound/soc/Makefile

diff --combined sound/soc/Makefile
index 8120b52a46867e6a5f99ae53ad2ec6bbb7670017,4eaf48aab0faeaabdcb8631b518ac62e443a917c..0c5eac01bf2e5ffbc8d4691987c7097b90dce90a
--- 1/sound/soc/Makefile
--- 2/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@@ -1,4 -1,4 +1,4 @@@
- snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o
+ snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o
  
  obj-$(CONFIG_SND_SOC) += snd-soc-core.o
  obj-$(CONFIG_SND_SOC) += codecs/
@@@ -7,8 -7,9 +7,10 @@@ 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/
+ obj-$(CONFIG_SND_SOC) += s6000/
  obj-$(CONFIG_SND_SOC) += sh/
- obj-$(CONFIG_SND_SOC)   += imx/
+ obj-$(CONFIG_SND_SOC) += txx9/