Merge branch 'clk-fixes' into clk-next

This commit is contained in:
Stephen Boyd 2015-05-01 18:25:10 -07:00
commit 396e339a77