ARM: Merge for-2635/s5pv210-clock
authorBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:04:10 +0000 (18:04 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:04:10 +0000 (18:04 +0900)
Merge branch 'for-2635/s5pv210-clock' into for-linus/samsung2

1  2 
arch/arm/plat-s5p/clock.c
arch/arm/plat-s5p/include/plat/s5p-clock.h

Simple merge