Merge branch 'for-2.6.37' into for-2.6.38

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

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

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

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