Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into...

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

Fri, 8 Aug 2008 20:10:12 +0000 (21:10 +0100)

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

Fri, 8 Aug 2008 20:10:12 +0000 (21:10 +0100)
author Ben Dooks <ben-linux@fluff.org>
Fri, 8 Aug 2008 20:10:12 +0000 (21:10 +0100)
committer Ben Dooks <ben-linux@fluff.org>
Fri, 8 Aug 2008 20:10:12 +0000 (21:10 +0100)
diff --cc arch/arm/mach-s3c2410/mach-bast.c
Simple merge
diff --cc arch/arm/mach-s3c2410/mach-vr1000.c
Simple merge
diff --cc arch/arm/mach-s3c2440/mach-anubis.c
Simple merge
diff --cc arch/arm/mach-s3c2440/mach-osiris.c
Simple merge
diff --cc drivers/serial/Kconfig
Simple merge
author	Ben Dooks <ben-linux@fluff.org>
	Fri, 8 Aug 2008 20:10:12 +0000 (21:10 +0100)
committer	Ben Dooks <ben-linux@fluff.org>
	Fri, 8 Aug 2008 20:10:12 +0000 (21:10 +0100)
		1	2
arch/arm/mach-s3c2410/mach-bast.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2410/mach-vr1000.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2440/mach-anubis.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2440/mach-osiris.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history