ARM: Merge next-samsung-clock2
authorBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 08:49:59 +0000 (17:49 +0900)
committerBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 08:49:59 +0000 (17:49 +0900)
Merge branch 'next-samsung-clock2' into next-samsung-try5


Trivial merge