Merged in this to avoid conflicts with the big locking fixes
from upstream.
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>

Conflicts:
	drivers/pinctrl/pinctrl-sunxi.c