Merge branch 'common/clkfwk' into sh-latest
Paul Mundt [Tue, 10 Jan 2012 04:31:09 +0000 (13:31 +0900)]

Trivial merge