Daniel Vetter 6e0aa8018f Linux 4.0-rc6 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVGHwjAAoJEHm+PkMAQRiG8rcIAJ6cEJ6mbqLpyz5XrGf4yNp0 +wG/QlEpT8rgrxe9wSjB3lfW3kR2Pe69b9fVVCdiklygdkmva5vfmDrVGGzYfe3M QrFSSlMVBplvh6IiM/L1mVMtr3DSmCO23YZZ9R5b7FoEYatNHRpNWBCBpuXpd4aD sLuIvO3L/S7LqeOAFkkYWv6AuL9umicmjR8u+nsmCSRJom7At/aJ6R66WIp9vxho Rn7r6wcUk6B2Q/gYNjdSE8SIwdyKhuBGyvqQ9U9s6Btg9DQfM/b0vG5kw9hqeAq/ 9445jqVDP1whA2vz6GjnvltidxrqRvuDPBwzOnFmY5U+KZz4lS3x2mnWAAJ3xWs= =TqVJ -----END PGP SIGNATURE----- Merge tag 'v4.0-rc6' into drm-intel-next Backmerge Linux 4.0-rc6 because conflicts are (again) getting out of hand. To make sure we don't lose any bugfixes from the 4.0-rc5-rc6 flurry of patches we've applied them all to -next too. Conflicts: drivers/gpu/drm/i915/intel_display.c Always take the version from -next, we've already handled all conflicts with explicit cherrypicking. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2015-03-30 16:37:08 +02:00
..
asm-generic
drm	drm/i915: fix definition of the DRM_IOCTL_I915_GET_SPRITE_COLORKEY ioctl	2015-03-27 09:10:26 +01:00
linux	Not entirely surprising: the ongoing QEMU work on virtio 1.0 has revealed	2015-03-17 10:36:01 -07:00
misc
mtd
rdma	IB/core: Add on demand paging caps to ib_uverbs_ex_query_device	2015-02-18 08:36:26 -08:00
scsi
sound	ALSA: usx2y: Move UAPI definition into include/uapi/sound/usb_stream.h	2015-01-28 17:33:49 +01:00
video
xen
Kbuild