]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6684cbdd0a2aafc79bec1bba4bebc4e484485277
treeb4a9ec1374ec9aed1022fdb32802c483952e5a97
parent70e23a74d18ed5ed860f70eec1aac21758d2e56a
parent5dfa044c3a3b9125da254b1d9969551d27523c1c
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