ARM: Merge next-samsung-devupdates1
authorBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 09:36:09 +0000 (18:36 +0900)
committerBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 09:36:09 +0000 (18:36 +0900)
Merge branch 'next-samsung-devupdates1' into next-samsung-try7

1  2 
arch/arm/mach-s3c6410/mach-smdk6410.c
arch/arm/plat-s3c/include/plat/devs.h
arch/arm/plat-samsung/Makefile

Simple merge
Simple merge
Simple merge