ARM: Merge for-2635/fb-updates1
authorBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:04:11 +0000 (18:04 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:04:11 +0000 (18:04 +0900)
Merge branch 'for-2635/fb-updates1' into for-linus/samsung2

1  2 
arch/arm/Makefile
arch/arm/mach-s3c2410/include/mach/regs-gpio.h
arch/arm/plat-samsung/include/plat/clock.h
arch/arm/plat-samsung/include/plat/cpu.h

Simple merge