Merge pincntrl to unblock further i915 changes on top by Hans. Signed-off-by: Jani Nikula <jani.nikula@intel.com> From: Linus Walleij <linus.walleij@linaro.org> Link: http://lore.kernel.org/r/CACRpkdaXFSJVkWJGzsVcvbUA9gpgP0Vbkwf1H-HWw8s35R9XYQ@mail.gmail.com