ARM: Merge for-2635-4/s5pv210-boards
authorBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 09:55:32 +0000 (18:55 +0900)
committerBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 09:55:32 +0000 (18:55 +0900)
commitea5a4e209ddca984bbb5803b30d5e013e631f9ac
treea7f2cdb121fc44cfd7c382207104f867f93736c9
parentfac3d3555568de1755025a9609daf492dd548a59
parenteff4c74da7944ba30feb47b51d1e9e940e6682ff
ARM: Merge for-2635-4/s5pv210-boards

Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1

Conflicts:
arch/arm/mach-s5pv210/include/mach/map.h
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/mach-s5pv210/include/mach/irqs.h
arch/arm/mach-s5pv210/include/mach/map.h
arch/arm/plat-samsung/Kconfig