Merge branch 'for-2.6.37' into for-2.6.38

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

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

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

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

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

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