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

1  2 
arch/arm/plat-s5p/Kconfig

Simple merge