ARM: Merge next-samsung-clock2
authorBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 09:36:12 +0000 (18:36 +0900)
committerBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 09:36:12 +0000 (18:36 +0900)
Merge branch 'next-samsung-clock2' into next-samsung-try7


Trivial merge