Merge branch 'clk-next-oxnas' into clk-next
authorMichael Turquette <mturquette@baylibre.com>
Sun, 23 Oct 2016 17:19:53 +0000 (10:19 -0700)
committerMichael Turquette <mturquette@baylibre.com>
Sun, 23 Oct 2016 17:19:53 +0000 (10:19 -0700)

Trivial merge