Dave Airlie 281d1bbd34 Merge remote-tracking branch 'origin/master' into drm-next ...

Backmerge Linus tree after rc5 + drm-fixes went in.

There were a few amdkfd conflicts I wanted to avoid,
and Ben requested this for nouveau also.

Conflicts:
	drivers/gpu/drm/amd/amdkfd/Makefile
	drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
	drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
	drivers/gpu/drm/amd/amdkfd/kfd_priv.h
	drivers/gpu/drm/amd/include/kgd_kfd_interface.h
	drivers/gpu/drm/i915/intel_runtime_pm.c
	drivers/gpu/drm/radeon/radeon_kfd.c

2015-01-22 10:44:41 +10:00

..

asm-generic

vfs: renumber FMODE_NONOTIFY and add to uniqueness check

2015-01-08 15:10:52 -08:00

drm

Merge tag 'topic/core-stuff-2014-12-19' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-01-09 09:13:41 +10:00

linux

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-01-20 18:19:31 +12: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

IB/core: Add flags for on demand paging support

2014-12-15 18:13:35 -08:00

scsi

…

sound

ALSA: oxfw: Add hwdep interface

2014-12-10 10:50:00 +01:00

video

…

xen

…

Kbuild

cxl: Add userspace header file

2014-10-08 20:15:57 +11:00