Merge branch 'next/drivers' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/arm-soc-for-next-contents.txt
index a7de2d2fee0df8060768c623db280b62914b0ad8,0000000000000000000000000000000000000000..f54e9d4a511f0e794b25bcb0351b83959530c3f1
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,27 -1,0 +1,36 @@@
 +for-next contents for 3.10: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
 +next/fixes-non-critical
 +      ux500/dt-fixes
 +                git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-fixes
 +
 +next/cleanup
 +      samsung/cleanup-s3c
 +                git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s3c
 +      samsung/cleanup-s5p
 +                git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s5p
 +
 +next/multiplatform
 +      nomadik/multiplatform
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-multiplatform
 +      spear/multiplatform
 +              patches <1363106816-9603-1-git-send-email-arnd@arndb.de>
 +      cns3xxx/multiplatform
 +              patches <1363299271-8283-1-git-send-email-arnd@arndb.de>
 +
++next/drivers
++      samsung/timer
++              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/timer-samsung
++              depends on samsung/cleanup-s3c
++      samsung/irq-s3c24xx
++              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/irq-s3c24xx
++      samsung/pinctrl-exynos
++              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/pinctrl-exynos
++

diff --cc arch/arm/mach-s5pv210/mach-goni.c
Simple merge