Merge branch 'fix/asoc' into for-next

diff --cc sound/soc/atmel/sam9g20_wm8731.c
Simple merge

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

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

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

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

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

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

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

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