ARM: Merge for-2635/gpio2
Ben Dooks [Wed, 19 May 2010 09:04:08 +0000 (18:04 +0900)]
Merge branch 'for-2635/gpio2' into for-linus/samsung2

1  2 
arch/arm/mach-s3c2410/Kconfig
arch/arm/mach-s3c2410/mach-bast.c
arch/arm/mach-s3c2410/mach-h1940.c
arch/arm/mach-s3c2410/mach-n30.c
arch/arm/mach-s3c2412/mach-jive.c
arch/arm/mach-s3c2412/mach-smdk2413.c
arch/arm/mach-s3c2440/Kconfig

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge