Merge branch 'topic/asoc' into for-linus

Conflicts:
	sound/soc/codecs/ad1938.c

diff --cc arch/arm/mach-davinci/board-dm365-evm.c
Simple merge

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

diff --cc arch/arm/plat-omap/include/plat/mcbsp.h
Simple merge

diff --cc arch/arm/plat-omap/mcbsp.c
Simple merge

diff --cc drivers/gpio/wm8994-gpio.c
Simple merge

diff --cc drivers/mfd/wm8994-core.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc sound/soc/codecs/tlv320aic3x.c
index 4a6d56c,eafa164..71a6990
--- 1/sound/soc/codecs/tlv320aic3x.c
--- 2/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@@ -38,8 -38,9 +38,10 @@@
  #include <linux/delay.h>
  #include <linux/pm.h>
  #include <linux/i2c.h>
+ #include <linux/gpio.h>
+ #include <linux/regulator/consumer.h>
  #include <linux/platform_device.h>
 +#include <linux/slab.h>
  #include <sound/core.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc sound/soc/codecs/wm8903.c
index fa5f99f,05b28cf..bf08282
--- 1/sound/soc/codecs/wm8903.c
--- 2/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@@ -23,8 -22,8 +22,9 @@@
  #include <linux/pm.h>
  #include <linux/i2c.h>
  #include <linux/platform_device.h>
 +#include <linux/slab.h>
  #include <sound/core.h>
+ #include <sound/jack.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>
  #include <sound/tlv.h>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc sound/soc/sh/fsi.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/soc/soc-dapm.c
Simple merge