Linus Walleij 7f36f5d11c Linux 4.10-rc6 ... -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJYjmvUAAoJEHm+PkMAQRiGHIoH/3VaTj7cCJZDnWZ2Wi2enWip f17zj0oAkFxuSx8XEVD5BKqMfGBCBjPNPwURysfcFVoSHNtHjbEr44VxiPfQj5s2 N+znVm5P9qlFuRA+7dgYUyEKOqcTgyT9jFNpvPF6bgMZDfJoB/wo53UU4lo3drcx cRe6OT4fEpAbtgbl73kIjOreBRr7oxlMPVEjCVRdL7ssCg+iqow0MEHcSoO7jmtj tu8hwwBMNh5B0yJRCJKV7Edc1+GHK57ju6rnGr5S2rwnR31omLpvnHJx0Ya6NVCZ yV3KGQeWm13ifbumMddEnAL61x2hOIzX//BqaZKdy258YPohkNtD8oacnjHnLMc= =5Rs+ -----END PGP SIGNATURE----- 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		2017-01-30 14:39:20 +01:00
..
Kconfig	pinctrl: uniphier: add UniPhier PH1-LD20 pinctrl driver	2016-05-31 12:57:45 +02:00
Makefile	pinctrl: uniphier: add UniPhier PH1-LD20 pinctrl driver	2016-05-31 12:57:45 +02:00
pinctrl-uniphier-core.c	pinctrl: Widen the generic pinconf argument from 16 to 24 bits	2017-01-26 15:22:32 +01:00
pinctrl-uniphier-ld4.c	pinctrl: uniphier: add Ethernet pin-mux settings	2016-07-11 09:53:25 +02:00
pinctrl-uniphier-ld6b.c	pinctrl: uniphier: add Ethernet pin-mux settings	2016-07-11 09:53:25 +02:00
pinctrl-uniphier-ld11.c	pinctrl: uniphier: add Ethernet pin-mux settings	2016-07-11 09:53:25 +02:00
pinctrl-uniphier-ld20.c	pinctrl: uniphier: fix Ethernet (RMII) pin-mux setting for LD20	2017-01-19 10:36:40 +01:00
pinctrl-uniphier-pro4.c	pinctrl: uniphier: add Ethernet pin-mux settings	2016-07-11 09:53:25 +02:00
pinctrl-uniphier-pro5.c	pinctrl: uniphier: allow to have pinctrl node under syscon node	2016-05-31 12:54:14 +02:00
pinctrl-uniphier-pxs2.c	pinctrl: uniphier: add Ethernet pin-mux settings	2016-07-11 09:53:25 +02:00
pinctrl-uniphier-sld8.c	pinctrl: uniphier: add Ethernet pin-mux settings	2016-07-11 09:53:25 +02:00
pinctrl-uniphier.h	pinctrl: uniphier: support pin configuration for dedicated pins	2016-05-31 12:50:47 +02:00