| commit | 7f36f5d11cda050b118f76d774151427a18d15ef | [log] [tgz] |
|---|---|---|
| author | Linus Walleij <linus.walleij@linaro.org> | Mon Jan 30 14:39:20 2017 +0100 |
| committer | Linus Walleij <linus.walleij@linaro.org> | Mon Jan 30 14:39:20 2017 +0100 |
| tree | 9d4fa3b830785b767525a5e6a065fe4297cd8112 | |
| parent | 2b24efa8e5c5042b0f126c09622b3e9e3c86a4fa [diff] | |
| parent | 566cf877a1fcb6d6dc0126b076aad062054c2637 [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