]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'rmk/devel-stable' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Aug 2011 17:02:36 +0000 (17:02 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Aug 2011 17:02:36 +0000 (17:02 +0000)
commitfb3cc8bd24fbf454d6c9abba1dbd22098890c0c4
tree499b77fc7c7ea31b3d17970fcd81c8ebd7ea4239
parent27c77fac45a92a9149c2dce1c50ec2b2d38fcd4c
parentad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893
Merge branch 'rmk/devel-stable' into for-next

Conflicts:
arch/arm/mach-u300/include/mach/memory.h
21 files changed:
arch/arm/mach-exynos4/mach-universal_c210.c
arch/arm/mach-imx/mach-armadillo5x0.c
arch/arm/mach-imx/mach-cpuimx35.c
arch/arm/mach-imx/mach-mx1ads.c
arch/arm/mach-imx/mach-mx25_3ds.c
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-mx5/board-cpuimx51.c
arch/arm/mach-mx5/board-cpuimx51sd.c
arch/arm/mach-mx5/board-mx51_3ds.c
arch/arm/mach-mx5/board-mx51_babbage.c
arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/board-mx51_efikasb.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-tegra/board-seaboard.c
arch/arm/mach-tegra/board-trimslice.c
arch/arm/mach-u300/core.c
arch/arm/mach-u300/include/mach/memory.h
arch/arm/mach-u300/u300.c
arch/arm/plat-mxc/include/mach/memory.h