ARM: Merge for-2635-4/s5p-devs
authorBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 10:38:30 +0000 (19:38 +0900)
committerBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 10:38:30 +0000 (19:38 +0900)
commit84eb9ecce20acfd287ba0d623fe5e99bfab08686
treeed60f11843face3b8b2016d9adea36a8d709bb6b
parentea5a4e209ddca984bbb5803b30d5e013e631f9ac
parent99c56e0ce1c11221948c7da127b0bbe1641cbe41
ARM: Merge for-2635-4/s5p-devs

Merge branch 'for-2635-4/s5p-devs' into for-2635-4/partial2

Conflicts:
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pc100/mach-smdkc100.c
arch/arm/plat-samsung/include/plat/devs.h