]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'next/boards' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 7 Oct 2013 18:36:07 +0000 (11:36 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 7 Oct 2013 18:36:32 +0000 (11:36 -0700)
commitd8d9244a017f76ad5ff995352b43c5bdb2da0ea6
treec692b63d59861893fa3cbdf936ac5e8819c0c069
parentf024eefe89433ac8c2f63f7b8504c4373b666a1e
parent586eeb01e723c80ea53a2897123642e68304d70c
Merge branch 'next/boards' into for-next

* next/boards:
  ARM: shmobile: lager: disable MMCIF Command Completion Signal, add CLK_CTRL2
  ARM: shmobile: kzm9g: disable MMCIF Command Completion Signal
  ARM: shmobile: armadillo800eva: disable MMCIF Command Completion Signal
  ARM: shmobile: ape6evm: disable MMCIF Command Completion Signal
  ARM: shmobile: bockw: add USB Function support
  ARM: shmobile: Koelsch support
  ARM: shmobile: bockw: add R-Car sound support (PIO)
  ARM: shmobile: bockw: enable global use of FPGA
  ARM: shmobile: lager: Fix Display Unit platform data
  ARM: shmobile: ape6evm: update MMC0, SDHI0 and SDHI1 with correct regulators
  ARM: shmobile: lager: Add Display Unit support
  ARM: shmobile: marzen: Add Display Unit support

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/Makefile
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/board-ape6evm.c
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-lager.c