Merge branch 'next/boards' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:34:39 +0000 (14:34 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:34:39 +0000 (14:34 -0700)
commita8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5
tree653ab2d3049d1231e7e462155564a6953d0a720a
parent8b1a13b02812b60b88920801363920956691feb3
parente6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad
Merge branch 'next/boards' into HEAD

Conflicts:
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/Kconfig.debug
arch/arm/configs/armadillo800eva_defconfig
arch/arm/mach-exynos/Kconfig
arch/arm/mach-imx/Kconfig
arch/arm/mach-ks8695/Makefile
arch/arm/mach-msm/Kconfig
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
arch/arm/mach-msm/io.c
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-marzen.c