ARM: Merge next-samsung-devupdates1
authorBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 08:48:35 +0000 (17:48 +0900)
committerBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 08:48:35 +0000 (17:48 +0900)
commitc3e71c6d21a760c27b511e3dd9dbe46517c6f0f7
tree2d9ba8e3ebbb7579f1af0493a9783f640ca86546
parent645f0b07fe0dd0fa697c5b327c2d8c005bd0b5c0
parent22c810ab3e25d16e6f128384d107b933b6fd8fff
ARM: Merge next-samsung-devupdates1

Merge branch 'next-samsung-devupdates1' into next-samsung-try5
arch/arm/mach-s3c6410/mach-smdk6410.c
arch/arm/plat-s3c/include/plat/devs.h
arch/arm/plat-samsung/Makefile