Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Apr 2017 00:04:31 +0000 (17:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Apr 2017 00:04:31 +0000 (17:04 -0700)
commit0060e79a1f5231940ef38e6621745c0c808065cb
treeff866bf345752cf17ba2b01a5081cc25d754642b
parent0e9117882da14e7914d05cf14781a7ac9c61c670
parent36c02d0be4c3c8804e51f9740f0d768e17f3b566
Merge tag 'clk-fixes-for-linus' of git://git./linux/kernel/git/clk/linux

Pull clk fix from Stephen Boyd:
 "One odd config build fix for a recent Allwinner clock driver change
  that got merged. The common code called code in another file that
  wasn't always built. This just forces it on so people don't run into
  this bad configuration"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: sunxi-ng: always select CCU_GATE