Merge branch 'clk-fixes' into clk-next

This commit is contained in:
Mike Turquette 2014-05-12 16:55:33 -07:00
commit e07b2b59c9
2 changed files with 8 additions and 3 deletions