Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/codecs/wm8350.c
Simple merge

diff --cc sound/soc/codecs/wm8400.c
Simple merge

diff --cc sound/soc/codecs/wm8990.c
Simple merge

diff --cc sound/soc/imx/imx-pcm-dma-mx2.c
Simple merge

diff --cc sound/soc/sh/siu_dai.c
Simple merge