From: Michael Turquette <mturquette@baylibre.com>
Date: Thu, 25 May 2017 21:11:11 +0000 (-0700)
Subject: Merge tag 'meson-clk-fixes-for-4.12-rc2' of git://github.com/baylibre/clk-meson into... 
X-Git-Tag: v4.12-rc7~31^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=658a7568030e287215b069a9c383c0fd0c5f57d5;p=karo-tx-linux.git

Merge tag 'meson-clk-fixes-for-4.12-rc2' of git://github.com/baylibre/clk-meson into clk-fixes

KConfig fix:
- clk: meson: gxbb: fix build error without RESET_CONTROLLER
---

658a7568030e287215b069a9c383c0fd0c5f57d5