]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd1f14557760443676dc31f429c92a3f05750cd6a
tree653ab2d3049d1231e7e462155564a6953d0a720a
parent2c5d45121abc66a8d1a369d18807f41559c0d458
parentd083b11517d02cd997a70d3d1624db6e69044df1
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