]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v4.10-rc6' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Mon, 30 Jan 2017 13:39:20 +0000 (14:39 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 30 Jan 2017 13:39:20 +0000 (14:39 +0100)
commit6e11efc93de7f0b28bc3ba81b1b34a1c693c2284
tree9d4fa3b830785b767525a5e6a065fe4297cd8112
parent224050830366006aab0b9b93d02ae1182fb79b76
parenta2323382aa4d62abf3cb3d164d2fc4212fb7f298
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
drivers/pinctrl/intel/pinctrl-baytrail.c
drivers/pinctrl/intel/pinctrl-broxton.c
drivers/pinctrl/intel/pinctrl-intel.c
drivers/pinctrl/meson/pinctrl-meson-gxbb.c
drivers/pinctrl/meson/pinctrl-meson-gxl.c
drivers/pinctrl/meson/pinctrl-meson.c
drivers/pinctrl/pinctrl-amd.c
drivers/pinctrl/samsung/pinctrl-exynos.c
include/linux/gpio/driver.h