Merge branch 'clk-fixes' into clk-next
authorMichael Turquette <mturquette@baylibre.com>
Fri, 22 Jul 2016 00:30:54 +0000 (17:30 -0700)
committerMichael Turquette <mturquette@baylibre.com>
Fri, 22 Jul 2016 00:30:54 +0000 (17:30 -0700)

Trivial merge