Merge branch 'for-2.6.37' into for-2.6.38

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

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

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

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