Merge branch 'clk-dove' into clk-next
authorMichael Turquette <mturquette@baylibre.com>
Tue, 22 Dec 2015 20:34:39 +0000 (12:34 -0800)
committerMichael Turquette <mturquette@baylibre.com>
Tue, 22 Dec 2015 20:34:39 +0000 (12:34 -0800)

Trivial merge