OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers/pinctrl/sirf
History
Linus Walleij 6ad30ce046 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
 		2013-08-29 09:46:30 +02:00
..
Makefile pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC 2013-06-16 11:56:49 +02:00
pinctrl-atlas6.c Linux 3.11-rc7 2013-08-29 09:46:30 +02:00
pinctrl-prima2.c pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC 2013-06-16 11:56:49 +02:00
pinctrl-sirf.c pinctrl: sirf: add missing __iomem annotation 2013-08-07 22:30:40 +02:00
pinctrl-sirf.h pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC 2013-06-16 11:56:49 +02:00