]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/boards' into for-next
authorOlof Johansson <olof@lixom.net>
Fri, 14 Jun 2013 23:55:10 +0000 (16:55 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 14 Jun 2013 23:56:06 +0000 (16:56 -0700)
commit5281599c5776dc902965afafe5b451dcab71f7a8
treeada84b851d0d23e83f2960e412d6d2e2d0516cad
parent5be9439ff2d0461252b91cc3cc9c04406125448d
parentc4e6be1bc8207163fe05a1ca69f174c57825fb14
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>
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-ux500/board-mop500-regulators.c
arch/arm/mach-ux500/board-mop500-sdi.c
arch/arm/mach-ux500/devices-db8500.c