Merge branch 'for-2.6.30' into for-2.6.31

diff --cc sound/soc/omap/n810.c
Simple merge

diff --cc sound/soc/omap/omap-mcbsp.c
Simple merge

diff --cc sound/soc/omap/omap-pcm.c
Simple merge

diff --cc sound/soc/pxa/pxa-ssp.c
Simple merge