Merge branch 'next-samsung-devel' into for-next

author Kukjin Kim <kgene.kim@samsung.com>

Sat, 3 Dec 2011 10:11:28 +0000 (19:11 +0900)

committer Kukjin Kim <kgene.kim@samsung.com>

Sat, 3 Dec 2011 10:11:28 +0000 (19:11 +0900)
author Kukjin Kim <kgene.kim@samsung.com>
Sat, 3 Dec 2011 10:11:28 +0000 (19:11 +0900)
committer Kukjin Kim <kgene.kim@samsung.com>
Sat, 3 Dec 2011 10:11:28 +0000 (19:11 +0900)
diff --cc arch/arm/mach-s3c64xx/mach-crag6410-module.c
Simple merge
author	Kukjin Kim <kgene.kim@samsung.com>
	Sat, 3 Dec 2011 10:11:28 +0000 (19:11 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Sat, 3 Dec 2011 10:11:28 +0000 (19:11 +0900)