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
..
acpi	ACPI: Try harder to resolve _ADR collisions for bridges	2013-08-07 22:55:00 +02:00
asm-generic	Fix TLB gather virtual address range invalidation corner cases	2013-08-16 08:52:46 -07:00
clocksource
crypto
drm	drm: fix 64 bit drm fixed point helpers	2013-07-30 17:24:13 -04:00
dt-bindings	Pin control fixes for the v3.11 series:	2013-07-28 18:19:27 -07:00
keys
kvm
linux	Linux 3.11-rc7	2013-08-29 09:46:30 +02:00
math-emu
media	[media] v4l2: added missing mutex.h include to v4l2-ctrls.h	2013-07-26 10:14:52 -03:00
memory
misc
net	ipv6: handle Redirect ICMP Message with no Redirected Header option	2013-08-22 20:08:21 -07:00
pcmcia
ras
rdma	Merge branches 'af_ib', 'cxgb4', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next	2013-07-08 11:22:11 -07:00
rxrpc
scsi
sound
target	target: make queue_tm_rsp() return void	2013-07-07 18:36:53 -07:00
trace	This contains fixes, optimizations and some clean ups	2013-07-22 19:07:24 -07:00
uapi	ipv4: expose IPV4_DEVCONF	2013-08-22 20:30:15 -07:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-07-09 16:04:31 -07:00
xen	Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block	2013-07-22 19:02:52 -07:00
Kbuild