Merge branch 'next/drivers' into for-next

* next/drivers:
  ARM: davinci: gpio: use gpiolib API instead of inline functions
  ARM: davinci: board: gpio device creation
  ARM: davinci: da8xx boards: gpio device creation
  ARM: davinci: support gpio platform device
  ARM: davinci: da8xx: support gpio platform device
  gpio: davinci: move to platform device
  gpio: davinci: coding style correction

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/arm-soc-for-next-contents.txt
index e8ba2202b69e8ac9af7adc610d6449047b72b59e,0000000000000000000000000000000000000000..574ddb7c4fa005fbfa27b0db0ca80cac6d973ca0
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,17 -1,0 +1,21 @@@
 +
 +
 +next/cleanup
 +      shark/removal
 +                git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/del-shark-for-v3.13
 +
 +next/soc
 +      samsung/s3c64xx-clk
 +              http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-clk-s3c64xx
 +
++next/drivers
++      davinci/gpio
++              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/gpio
++
 +next/dt
 +      samsung/s3c64xx-dt
 +                http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-s3c64xx
 +      ux500/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-v3.13-2
 +              patch "ARM: ux500: enable appended dtb in u8500_defconfig"
 +

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