From: Kukjin Kim <kgene.kim@samsung.com>
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: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=880bcd4a8363f24375027f9ded4670960dcfa70a;p=linux.git

Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx

Conflicts:
	arch/arm/mach-s3c24xx/include/mach/system.h
---

880bcd4a8363f24375027f9ded4670960dcfa70a