Linus Walleij 6ad30ce046 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

2013-08-29 09:46:30 +02:00

..

Makefile

…

pinctrl-atlas6.c

Merge tag 'v3.11-rc7' into devel

2013-08-29 09:46:30 +02:00

pinctrl-prima2.c

…

pinctrl-sirf.c

pinctrl: sirf: add missing __iomem annotation

2013-08-07 22:30:40 +02:00

pinctrl-sirf.h

…