]> err.no Git - linux-2.6/commitdiff
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into...
authorBen Dooks <ben-linux@fluff.org>
Fri, 8 Aug 2008 20:10:12 +0000 (21:10 +0100)
committerBen 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
arch/arm/mach-s3c2410/mach-vr1000.c
arch/arm/mach-s3c2440/mach-anubis.c
arch/arm/mach-s3c2440/mach-osiris.c
drivers/serial/Kconfig

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge