From: Arnd Bergmann Date: Tue, 1 Nov 2011 16:12:22 +0000 (+0100) Subject: Merge branch 'imx/devel' into next/dt X-Git-Tag: v3.2-rc1~89^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c72dbae971400e466ad9ff16c920cd6d9d8c55a1;p=pandora-kernel.git Merge branch 'imx/devel' into next/dt The board changes in the imx/devel branch conflict with other changes in the device imx/dt branch. Conflicts: arch/arm/mach-mx5/board-mx53_loco.c arch/arm/mach-mx5/board-mx53_smd.c arch/arm/plat-mxc/include/mach/common.h arch/arm/plat-mxc/include/mach/memory.h Signed-off-by: Arnd Bergmann --- c72dbae971400e466ad9ff16c920cd6d9d8c55a1 Reading git-diff-tree failed