Daniel Vetter 0b076ecdf3 Merge remote-tracking branch 'airlied/drm-next' into HEAD ... Backmerge drm-next because the conflict between Ander's atomic fixes for 4.2 and Maartens future work are getting to unwielding to handle. Conflicts: drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_ringbuffer.h Just always take ours, same as git merge -X ours, but done by hand because I didn't trust git: It's confusing that it doesn't show any conflicts in the merge diff at all. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2015-06-23 14:01:53 +02:00
..
asm-generic	errno.h: Improve ENOSYS's comment	2015-04-17 09:03:58 -04:00
drm	Merge remote-tracking branch 'airlied/drm-next' into HEAD	2015-06-23 14:01:53 +02:00
linux	virtgpu: include linux/types.h to avoid warning.	2015-06-05 12:31:12 +10:00
misc	cxl: Add documentation for userspace APIs	2014-10-08 20:16:19 +11:00
mtd	mtd: lpddr: add driver for LPDDR2-NVM PCM memories	2014-05-20 17:45:17 -07:00
rdma	RDMA/core: Enable the iWarp Port Mapper to provide the actual address of the connecting peer to its clients	2015-05-05 09:18:01 -04:00
scsi
sound	ALSA: asound.h - use SNDRV_CTL_ELEM_ID_NAME_MAXLEN	2015-04-18 09:05:55 +02:00
video
xen
Kbuild	cxl: Add userspace header file	2014-10-08 20:15:57 +11:00