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

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/pinctrl/intel/pinctrl-baytrail.c
Simple merge

diff --cc drivers/pinctrl/intel/pinctrl-broxton.c
Simple merge

diff --cc drivers/pinctrl/intel/pinctrl-intel.c
Simple merge

diff --cc drivers/pinctrl/meson/pinctrl-meson-gxbb.c
Simple merge

diff --cc drivers/pinctrl/meson/pinctrl-meson-gxl.c
Simple merge

diff --cc drivers/pinctrl/meson/pinctrl-meson.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-amd.c
Simple merge

diff --cc drivers/pinctrl/samsung/pinctrl-exynos.c
Simple merge

diff --cc include/linux/gpio/driver.h
Simple merge