ARM: Merge next-samsung-devupdates1

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

Tue, 19 Jan 2010 09:36:09 +0000 (18:36 +0900)

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

Tue, 19 Jan 2010 09:36:09 +0000 (18:36 +0900)
author Ben Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 09:36:09 +0000 (18:36 +0900)
committer Ben Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 09:36:09 +0000 (18:36 +0900)
diff --cc arch/arm/mach-s3c6410/mach-smdk6410.c
Simple merge
diff --cc arch/arm/plat-s3c/include/plat/devs.h
Simple merge
diff --cc arch/arm/plat-samsung/Makefile
Simple merge
author	Ben Dooks <ben-linux@fluff.org>
	Tue, 19 Jan 2010 09:36:09 +0000 (18:36 +0900)
committer	Ben Dooks <ben-linux@fluff.org>
	Tue, 19 Jan 2010 09:36:09 +0000 (18:36 +0900)
		1	2
arch/arm/mach-s3c6410/mach-smdk6410.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s3c/include/plat/devs.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history