Merge branch 'dev/cleanup-clocks' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Wed, 5 Jan 2011 00:39:23 +0000 (09:39 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 5 Jan 2011 00:39:23 +0000 (09:39 +0900)

Trivial merge