Merge tag 'v4.16-rc5' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Sun, 18 Mar 2018 16:48:59 +0000 (17:48 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Sun, 18 Mar 2018 16:48:59 +0000 (17:48 +0100)
commit95260c17b27e4bdacf85022e629fb701b42cc190
treecfc6963180d99e5f36752ca028821aaa109e860d
parent4f9a4cd66c1201ce2b26ba895b2be63b8b38bb68
parent0c8efd610b58cb23cefdfa12015799079aef94ae
Merge tag 'v4.16-rc5' into devel

Linux 4.16-rc5 merged into the GPIO devel branch to resolve
a nasty conflict between fixes and devel in the RCAR driver.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
MAINTAINERS
arch/x86/Kconfig
drivers/gpio/gpio-rcar.c
drivers/watchdog/Kconfig