Merge branch 'common/clkfwk' into sh-fixes-for-linus
Paul Mundt [Tue, 16 Nov 2010 01:11:20 +0000 (10:11 +0900)]

Trivial merge