Merge branch 'next-s3c64xx' into next-merged

author Ben Dooks <ben-linux@fluff.org>

Thu, 18 Dec 2008 14:52:04 +0000 (14:52 +0000)

committer Ben Dooks <ben-linux@fluff.org>

Thu, 18 Dec 2008 14:52:04 +0000 (14:52 +0000)
author Ben Dooks <ben-linux@fluff.org>
Thu, 18 Dec 2008 14:52:04 +0000 (14:52 +0000)
committer Ben Dooks <ben-linux@fluff.org>
Thu, 18 Dec 2008 14:52:04 +0000 (14:52 +0000)
diff --cc arch/arm/plat-s3c/Kconfig
Simple merge
diff --cc arch/arm/plat-s3c/include/plat/uncompress.h
Simple merge
diff --cc arch/arm/plat-s3c24xx/Kconfig
Simple merge
diff --cc arch/arm/plat-s3c24xx/devs.c
Simple merge
author	Ben Dooks <ben-linux@fluff.org>
	Thu, 18 Dec 2008 14:52:04 +0000 (14:52 +0000)
committer	Ben Dooks <ben-linux@fluff.org>
	Thu, 18 Dec 2008 14:52:04 +0000 (14:52 +0000)
		1	2
arch/arm/plat-s3c/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s3c/include/plat/uncompress.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s3c24xx/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s3c24xx/devs.c	patch \|	diff1 \|	diff2 \|	blob \| history