Merge branch 'ib-mvebu-98dx3236' into devel

author Linus Walleij <linus.walleij@linaro.org>

Mon, 30 Jan 2017 13:55:27 +0000 (14:55 +0100)

committer Linus Walleij <linus.walleij@linaro.org>

Mon, 30 Jan 2017 13:55:27 +0000 (14:55 +0100)
author Linus Walleij <linus.walleij@linaro.org>
Mon, 30 Jan 2017 13:55:27 +0000 (14:55 +0100)
committer Linus Walleij <linus.walleij@linaro.org>
Mon, 30 Jan 2017 13:55:27 +0000 (14:55 +0100)
diff --cc drivers/pinctrl/mvebu/pinctrl-armada-xp.c
Simple merge
author	Linus Walleij <linus.walleij@linaro.org>
	Mon, 30 Jan 2017 13:55:27 +0000 (14:55 +0100)
committer	Linus Walleij <linus.walleij@linaro.org>
	Mon, 30 Jan 2017 13:55:27 +0000 (14:55 +0100)