tree 34af8fc78b28281fcfe531a26401b440c078038e
parent 0351c287952483dafa904f84496631198465fbf4
parent d8dfad3876e4386666b759da3c833d62fb8b2267
author Linus Walleij <linus.walleij@linaro.org> 1377762390 +0200
committer Linus Walleij <linus.walleij@linaro.org> 1377762390 +0200
mergetag object d8dfad3876e4386666b759da3c833d62fb8b2267
 type commit
 tag v3.11-rc7
 tagger Linus Torvalds <torvalds@linux-foundation.org> 1377477813 -0700
 
 Linux 3.11-rc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJSGqS5AAoJEHm+PkMAQRiGFxEH/3VrqF6WAkcviNiW/0DCdO8k
 v6Wi7Sp5LxVkwzmOCHCV1tTHwLRlH3cB9YmJlGQ0kHCREaAuEQAB0xJXIW7dnyYj
 Qq7KoRZEMe3wizmjEsj8qsrhfMLzHjBw67hBz2znwW/4P7YdgzwD7KRiEat+yRC9
 ON3nNL2zIqpfk92RXvVrSVl4KMEM+WNbOfiffgBiEP24Ja1MJMFH1d4i6hNOaB0x
 9Pb3Lw8let92x+8Ao5jnjKdKMgVsoZWbN/TgQR8zZOHM38AGGiDgk18vMz+L+hpS
 jqfjckxj1m30jGq0qZ9ZbMZx3IGif4KccVr30MqNHJpwi6Q24qXvT3YfA3HkstM=
 =nAab
 -----END PGP SIGNATURE-----

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