Merge branch 'clk-artpec6' into clk-next
authorStephen Boyd <sboyd@codeaurora.org>
Fri, 15 Apr 2016 23:02:46 +0000 (16:02 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Fri, 15 Apr 2016 23:02:46 +0000 (16:02 -0700)
commit75ff88888093eddca478a8fa1b77b30edb4fa8be
tree97990ff554f2e37084fa69a8fee891c13eb287be
parentc02b73c943d723511abecde7909d0818638d1bc2
parent33b8ac917a8f7a22fa3d779f875646201d0097a0
Merge branch 'clk-artpec6' into clk-next

* clk-artpec6:
  clk: add artpec-6 clock controller
  clk: add device tree binding for Artpec-6 clock controller
drivers/clk/Makefile