Merge tag 'v3.11-rc7' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 29 Aug 2013 07:46:30 +0000 (09:46 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 29 Aug 2013 07:46:30 +0000 (09:46 +0200)
commit6ad30ce046aefbdc3848232c665a728860d7bb68
tree34af8fc78b28281fcfe531a26401b440c078038e
parent0351c287952483dafa904f84496631198465fbf4
parentd8dfad3876e4386666b759da3c833d62fb8b2267
Merge tag 'v3.11-rc7' into devel

Merged in this to avoid conflicts with the big locking fixes
from upstream.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Conflicts:
drivers/pinctrl/pinctrl-sunxi.c
MAINTAINERS
arch/arm/boot/dts/atlas6.dtsi
drivers/pinctrl/core.c
drivers/pinctrl/pinctrl-single.c
drivers/pinctrl/pinctrl-sunxi.c
drivers/pinctrl/sh-pfc/pfc-sh73a0.c
drivers/pinctrl/sirf/pinctrl-atlas6.c