ARM: Merge for-2635-4/ts-machines
authorBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 09:51:59 +0000 (18:51 +0900)
committerBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 09:51:59 +0000 (18:51 +0900)
Merge branch 'for-2635-4/ts-machines' into for-2635-4/partial1

1  2 
arch/arm/mach-s5pv210/Kconfig

Simple merge