Merge tag 'meson-clk-for-4.15' of git://github.com/baylibre/clk-meson into clk-next
authorStephen Boyd <sboyd@codeaurora.org>
Tue, 31 Oct 2017 23:25:07 +0000 (16:25 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Tue, 31 Oct 2017 23:25:07 +0000 (16:25 -0700)
commit319663c7d16e9f2329958205d8ff92c9ccb3ea21
tree6816e04816fefa8e124a71375150937a0ce1ba93
parentffc3eb6f3a836ad2c05040989ac3ae7a113efcdd
parent762a1f2098b2fd4f84ccdb62d5747fff1ad7f816
Merge tag 'meson-clk-for-4.15' of git://github.com/baylibre/clk-meson into clk-next

Pull Amlogic clock driver updates from Neil Armstrong:

 - Addition of Video Processing Unit VPU and VAPB clocks

* tag 'meson-clk-for-4.15' of git://github.com/baylibre/clk-meson:
  clk: meson: gxbb: Add VPU and VAPB clocks data
  clk: meson: gxbb: Add VPU and VAPB clockids