Merge branch 'clk-fixes' into clk-next

This commit is contained in:
Stephen Boyd 2015-05-07 11:32:49 -07:00
commit 18e70efe3e