Merge branch 'topic/asoc' into for-linus

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
Simple merge

diff --cc arch/arm/mach-omap2/board-zoom2.c
Simple merge

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

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