Merge branch 'next/boards' into for-next

* next/boards:
  ARM: ux500: avoid warning in ux500_read_asicid
  ARM: ux500: add ABx500 pinctrl tables
  ARM: ux500: update MSP1 pinctrl defintions
  ARM: ux500: regulators: Remove misleading comment
  ARM: ux500: Enable support for UHS-I SD-cards
  ARM: ux500: Set eMMC and WLAN card slot as non-removable
  ARM: ux500: Enable support for discard for MMC/SD
  ARM: ux500: Enable support for RPMB and Reliable Write for eMMC
  ARM: ux500: Don't set plf ocr mask for SD/MMC device
  ARM: ux500: Enable 100MHz for SD/SDIO/MMC devices
  ARM: ux500: Remove incorrect DB9540 PRCMU TCDM base location
  ARM: ux500: Increase the size of the PRCMU's TCPM size

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

diff --cc arch/arm/arm-soc-for-next-contents.txt
index c807bbb922861b30e910ad4587c0ba86d3e74be6,0000000000000000000000000000000000000000..097316fd88359aad4434b6eb9e43a56e7ff532a4
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,152 -1,0 +1,156 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
 +depends/rmk-devel-stable
 +      http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable
 +
 +next/fixes-non-critical
 +      mvebu/fixes-non-critical
 +              git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
 +      sirf/fixes-non-critical
 +              git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git tags/sirf-arm-soc-v3.10-fixes
 +      omap/fixes-non-critical
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-non-critical-signed           
 +      davinci/board
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.11/board
 +
 +next/cleanup
 +      at91/cleanup
 +              git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +      machdesc/cleanup
 +              git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11
 +      mvebu/cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3
 +      dt/pci-helpers
 +              git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11
 +      omap/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
 +      mvebu/cleanup4
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-4
 +
 +next/soc
 +      mvebu/soc
 +              git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2
 +      mvebu/defconfig
 +              git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3
 +      mvebu/pcie
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2
 +      mvebu/pcie-kirkwood
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11
 +      mvebu/pcie2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11
 +      mvebu/clk-cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11
 +      vexpress/dual-cluster
 +              git://git.linaro.org/people/nico/linux VExpress_DCSCB
 +              depends on depends/rmk-devel-stable
 +              +patch "drivers/bus: arm-cci: fix combined ARMv6+v7 build"
 +      zynq/clk
 +              git://git.xilinx.com/linux-xlnx tags/zynq-clk-for-3.11
 +      mvebu/pcie-kirkwood2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11-2
 +      renesas/pinmux-gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.11
 +      renesas/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11
 +      clps711x/soc
 +              patches
 +                      GPIO: clps711x: Rewrite driver for using generic GPIO cod
 +                      GPIO: clps711x: Add DT support
 +                      ARM: clps711x: Re-add GPIO support
 +                      ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency
 +                      ARM: clps711x: Set PLL clock to zero if we work from 13 mHz sourc
 +                      ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file
 +                      ARM: clps711x: autcpu12: Add support for NOR flash
 +                      ARM: clps711x: autcpu12: Special driver for handling memory is re
 +                      ARM: clps711x: autcpu12: Move remaining specific definitions to b
 +                      ARM: clps711x: p720t: Define PLD registers as GPIOs
 +                      ARM: clps711x: Move specific definitions from hardware.h to board
 +                      ARM: clps711x: Replace "arch_initcall" in common code with ".init
 +                      ARM: clps711x: Add clocksource framework
 +                      ARM: clps711x: Optimize interrupt handling
 +                      ARM: clps711x: edb7211: Add support for I2C
 +                      ARM: clps711x: edb7211: Control LCD backlight via PWM
 +                      ARM: clps711x: Add support for SYSCON driver
 +                      ARM: clps711x: Update defconfig
 +      patches
 +              ARM: socfpga: Add support to gate peripheral clocks
 +              ARM: socfpga: Add syscon to be part of socfpga
 +      samsung/s3c24xx-arch
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-arch-1
 +      omap/pm
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-signed
 +      omap/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
 +      omap/omap5
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-signed
 +      mvebu/regmap
 +              git://git.infradead.org/users/jcooper/linux.git tags/regmap-3.11
 +                      depends on cleanup and fixes-non-critical branches
 +      integrator/pci
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-pci-for-arm-soc
 +
 +next/boards
 +      mvebu/boards
 +                git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
 +      renesas/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.11
 +      renesas/boards
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.11
 +              depends on renesas/pinmux-gpio
 +              depends on renesas/soc
++      ux500/core
++              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-core-for-arm-soc
++      ux500/pinctrl
++              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-pinctrl-for-arm-soc
 +
 +next/dt
 +      nomadik/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +      mvebu/dt
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3
 +      patch
 +              "ARM: nomadik: fix clocksource warning"
 +      at91/dt
 +              git://github.com/at91linux/linux-at91.git tags/at91-dt
 +      vt8500/dt
 +              git://github.com/linux-wmt/linux-vtwm vt8500/dts-3.11
 +      cleanup/dts-cpus
 +              git://linux-arm.org/linux-2.6-lp dts-cpus-updates
 +      patch
 +              "ARM: dts: add missing cpu #address-cell values"
 +      mvebu/dt4
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-4
 +      renesas/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.11
 +      patches
 +              ARM: socfpga: dts: Add ethernet bindings for SOCFPGA
 +              ARM: socfpga: dts: Add gate-clock bindings
 +      samsung/s3c24xx-dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-dt-1
 +      samsung/exynos-dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-dt-1
 +      mvebu/dt5
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-5
 +
 +next/drivers
 +      ux500/dma40
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +      timer/dw_apb_timer_of
 +              git://github.com/mmind/linux-rockchip.git tags/dw_apb_timer_of
 +      samsung/s3c24xx-drivers
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-driver-1
 +      omap/gpmc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
 +
 +next/mailbox:
 +      mailbox/subsystem
 +              git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox
 +
 +

diff --cc arch/arm/mach-ux500/board-mop500-regulators.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500-sdi.c
Simple merge

diff --cc arch/arm/mach-ux500/devices-db8500.c
Simple merge