7f36f5d11c
-----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 |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
pinctrl-uniphier-core.c | ||
pinctrl-uniphier-ld4.c | ||
pinctrl-uniphier-ld6b.c | ||
pinctrl-uniphier-ld11.c | ||
pinctrl-uniphier-ld20.c | ||
pinctrl-uniphier-pro4.c | ||
pinctrl-uniphier-pro5.c | ||
pinctrl-uniphier-pxs2.c | ||
pinctrl-uniphier-sld8.c | ||
pinctrl-uniphier.h |