From: Arnd Bergmann Date: Mon, 9 Jan 2012 16:01:00 +0000 (+0000) Subject: Merge branch 'samsung/dt' into samsung/cleanup X-Git-Tag: v3.3-rc1~140^2^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a07613a54d700a974f3a4a657da78ef5d097315d;p=pandora-kernel.git Merge branch 'samsung/dt' into samsung/cleanup Conflicts: arch/arm/mach-s3c64xx/Makefile arch/arm/mach-s5pc100/Makefile arch/arm/mach-s5pv210/Makefile Pull in previously resolved conflicts: The Makefiles were reorganized in the "rmk/restart" series and modified in the "samsung/cleanup series". This also pulls in the other conflict resolutions from the restart series against the samsung/dt series. Signed-off-by: Arnd Bergmann --- a07613a54d700a974f3a4a657da78ef5d097315d Reading git-diff-tree failed