Merge branch 'topic/core-cleanup' into for-next

Conflicts:
	sound/soc/codecs/ad1938.c

diff --cc arch/arm/mach-davinci/board-dm365-evm.c
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/core/jack.c
Simple merge

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

diff --cc sound/soc/codecs/ak4642.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/tlv320dac33.c
Simple merge

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

diff --cc sound/soc/codecs/wm8350.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/wm8903.c
index 134b17532f23b23a1fa932f5a0e8dbf1287f4e86,fa5f99fde68bfcc7ca19b62e874589742acd0c2b..e8eefd2b706b0d82b6226e66c0768775654aa20e
--- 1/sound/soc/codecs/wm8903.c
--- 2/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@@ -22,8 -23,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/wm8960.c
Simple merge

diff --cc sound/soc/codecs/wm8994.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

diff --cc sound/usb/usx2y/us122l.c
Simple merge