Dave Airlie bdcddf95e8 Backmerge v4.1-rc4 into into drm-next ...

We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts

Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/drm_irq.c

2015-05-20 16:23:53 +10:00

..

asm-generic

errno.h: Improve ENOSYS's comment

2015-04-17 09:03:58 -04:00

drm

Merge tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-05-08 20:51:06 +10:00

linux

Backmerge v4.1-rc4 into into drm-next

2015-05-20 16:23:53 +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

[SCSI] Merge tag 'fcoe-02-19-13' into for-linus

2013-03-01 09:10:08 +00:00

sound

ALSA: asound.h - use SNDRV_CTL_ELEM_ID_NAME_MAXLEN

2015-04-18 09:05:55 +02:00

video

UAPI: (Scripted) Disintegrate include/video

2012-12-20 17:14:26 +00:00

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