Merge branch 'for-2.6.31' into for-2.6.32

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

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

diff --cc sound/soc/soc-core.c
Simple merge