tree 6348e919762ae4c8844440deaf44141672d42746
parent 0b2e78865d92e2d70542cb1d4d7af1d4ea0a286d
parent 5b73840375e3eebeb7adf957ff64a96abdf4e1a1
author Michael Turquette <mturquette@baylibre.com> 1451770869 -0800
committer Michael Turquette <mturquette@baylibre.com> 1451770869 -0800

Merge branch 'clk-rockchip' into clk-next