Merge branch 'common/clkfwk' into sh-fixes-for-linus
Paul Mundt [Fri, 19 Nov 2010 07:43:23 +0000 (16:43 +0900)]

Trivial merge