Merge tag 'v4.19-rc6' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Mon, 1 Oct 2018 11:20:45 +0000 (13:20 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 1 Oct 2018 11:20:45 +0000 (13:20 +0200)
commit30aa69e7bd9f7af3574120249eecb3726dcaf737
treeb4a9ec1374ec9aed1022fdb32802c483952e5a97
parent63e037bc51b32d414cd07dd700e71359ce27a11f
parent17b57b1883c1285f3d0dc2266e8f79286a7bef38
Merge tag 'v4.19-rc6' into devel

This is the 4.19-rc6 release

I needed to merge this in because of extensive conflicts in
the MSM and Intel pin control drivers. I know how to resolve
them, so let's do it like this.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/cirrus/pinctrl-madera-core.c
drivers/pinctrl/intel/pinctrl-cannonlake.c
drivers/pinctrl/intel/pinctrl-intel.c
drivers/pinctrl/pinctrl-amd.c
drivers/pinctrl/pinctrl-ingenic.c
drivers/pinctrl/qcom/pinctrl-msm.c