Daniel Vetter ca6e440577 Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued ... Backmerge fixes since it's getting out of hand again with the massive split due to atomic between -next and 4.2-rc. All the bugfixes in 4.2-rc are addressed already (by converting more towards atomic instead of minimal duct-tape) so just always pick the version in next for the conflicts in modeset code. All the other conflicts are just adjacent lines changed. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h drivers/gpu/drm/i915/intel_ringbuffer.h Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2015-07-15 16:36:50 +02:00
..
asm-generic	errno.h: Improve ENOSYS's comment	2015-04-17 09:03:58 -04:00
drm	Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued	2015-07-15 16:36:50 +02:00
linux	virtio/vhost: cross endian support	2015-07-03 16:02:25 -07:00
misc	cxl: Implement an ioctl to fetch afu card-id, offset-id and mode	2015-06-03 13:27:15 +10:00
mtd	mtd: lpddr: add driver for LPDDR2-NVM PCM memories	2014-05-20 17:45:17 -07:00
rdma	IB/core: Add timestamp_mask and hca_core_clock to query_device	2015-06-12 14:49:10 -04:00
scsi
sound	ALSA: topology: Export ID types for TLV controls.	2015-06-04 09:40:03 +01:00
video
xen	xen: install xen/gntdev.h and xen/gntalloc.h	2014-02-11 10:12:36 -05:00
Kbuild	cxl: Add userspace header file	2014-10-08 20:15:57 +11:00