git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Linus Walleij <linus.walleij@linaro.org>
	Mon, 30 Jan 2017 13:39:20 +0000 (14:39 +0100)
committer	Linus Walleij <linus.walleij@linaro.org>
	Mon, 30 Jan 2017 13:39:20 +0000 (14:39 +0100)
commit	7f36f5d11cda050b118f76d774151427a18d15ef
tree	9d4fa3b830785b767525a5e6a065fe4297cd8112	tree \| snapshot (tar.gz zip)
parent	2b24efa8e5c5042b0f126c09622b3e9e3c86a4fa	commit \| diff
parent	566cf877a1fcb6d6dc0126b076aad062054c2637	commit \| diff

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

drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/intel/pinctrl-baytrail.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/intel/pinctrl-broxton.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/intel/pinctrl-intel.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/meson/pinctrl-meson-gxbb.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/meson/pinctrl-meson-gxl.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/meson/pinctrl-meson.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-amd.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/samsung/pinctrl-exynos.c	diff1 \|	diff2 \|	blob \| history
include/linux/gpio/driver.h	diff1 \|	diff2 \|	blob \| history