Merge branch 'sh/clkfwk' into sh-latest

This commit is contained in:
Paul Mundt 2012-01-24 10:45:43 +09:00
commit 75ed4da481