From: Kukjin Kim Date: Fri, 31 Dec 2010 01:52:05 +0000 (+0900) Subject: Merge branch 'next-s5pv310' into for-next X-Git-Tag: v2.6.38-rc1~38^2^2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=285dee7ff4fb4b32838694d4378f4aa938cf5b43;p=pandora-kernel.git Merge branch 'next-s5pv310' into for-next Conflicts: arch/arm/mach-s5pv310/Kconfig arch/arm/mach-s5pv310/Makefile arch/arm/mach-s5pv310/mach-smdkc210.c arch/arm/mach-s5pv310/mach-smdkv310.c arch/arm/plat-samsung/include/plat/devs.h --- 285dee7ff4fb4b32838694d4378f4aa938cf5b43 Reading git-diff-tree failed