From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 30 Jan 2017 13:39:20 +0000 (+0100)
Subject: Merge tag 'v4.10-rc6' into devel
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7f36f5d11cda050b118f76d774151427a18d15ef;p=linux.git

Merge tag 'v4.10-rc6' into devel

Linux 4.10-rc6

Resolved conflicts in:
	drivers/pinctrl/pinctrl-amd.c
	drivers/pinctrl/samsung/pinctrl-exynos.c
---

7f36f5d11cda050b118f76d774151427a18d15ef