linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-26 22:55:01 -05:00

Files

Daniel Vetter 622147fdad Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes

Backmerge drm-intel-fixes because a bunch of atomic patch backporting
we had to do lead to horrible conflicts.

Conflicts:
	drivers/gpu/drm/drm_crtc.c
Just a bit of context conflict between -next and -fixes.
	drivers/gpu/drm/i915/intel_atomic.c
	drivers/gpu/drm/i915/intel_display.c
Atomic conflicts, always pick the code from -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

2015-08-14 18:11:30 +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-08-14' into drm-intel-next-fixes

2015-08-14 18:11:30 +02:00

linux

Merge tag 'pci-v4.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2015-08-04 09:27:19 -07:00

misc

cxl: Implement an ioctl to fetch afu card-id, offset-id and mode