From: Kukjin Kim Date: Fri, 2 Mar 2012 23:57:03 +0000 (+0900) Subject: Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx X-Git-Tag: v3.4-rc1~91^2~4^2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=880bcd4a8363f24375027f9ded4670960dcfa70a;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx Conflicts: arch/arm/mach-s3c24xx/include/mach/system.h --- 880bcd4a8363f24375027f9ded4670960dcfa70a