Merge branch 'next/soc' into for-next

Conflicts:
	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index f7f2c68bc56636b9cbf016ad7e952fd72af1f841,8b53e77c9ef94eed231b0ad3c4912fd9af342d48..d6c813c19364bd48040426f5ce77d6507c50873e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1608,10 -1660,10 +1608,10 @@@ config LOCAL_TIMER
  config ARCH_NR_GPIO
        int
        default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
 -      default 392 if ARCH_U8500
 -      default 264 if MACH_H4700
        default 512 if SOC_OMAP5
-       default 355 if ARCH_U8500
++      default 392 if ARCH_U8500
        default 288 if ARCH_VT8500 || ARCH_SUNXI
 +      default 264 if MACH_H4700
        default 0
        help
          Maximum number of GPIOs in the system.

diff --cc arch/arm/arm-soc-for-next-contents.txt
index c304ecb3dc2640e379aab0e564a3fef5a94b265a,0000000000000000000000000000000000000000..32a471725b8b898a321a555ac11fcbc064c4c9b0
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,51 -1,0 +1,56 @@@
 +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
 +      clksrc/cleanup
 +                git://sources.calxeda.com/kernel/linux.git tags/clksrc-cleanup-for-3.10
 +      at91/cleanup
 +                git://github.com/at91linux/linux-at91.git tags/at91-soc
 +
 +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/dt
 +      mvebu/dt
 +              git://git.infradead.org/users/jcooper/linux.git tags/mvebu_dt_for_v3.10
 +      at91/dt
 +                git://github.com/at91linux/linux-at91.git tags/at91-dt
 +
 +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
 +      at91/lcdfb
 +              git://github.com/at91linux/linux-at91.git tags/at91-driversLCD
 +
 +next/soc
 +      prima2/soc
 +              patches <1363590279-5656-1-git-send-email-Barry.Song@csr.com>
++      ux500/defconfig
++              http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-defconfig-v3.10
++      ux500/core
++              http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-core-v3.10
++