git.maquefel.me Git - linux.git/commit

author	Dave Airlie <airlied@redhat.com>
	Wed, 20 May 2015 06:23:53 +0000 (16:23 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Wed, 20 May 2015 06:23:53 +0000 (16:23 +1000)
commit	bdcddf95e82b1c4e370fc1196b1f4f50f775dab4
tree	ef2af2b3faee1f8e8287ca45d265809f56fbd0f6	tree \| snapshot
parent	91d9f9856f91c82ac6289a0fff65dd12cfa07e34	commit \| diff
parent	e26081808edadfd257c6c9d81014e3b25e9a6118	commit \| diff

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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lvds.c	diff1 \|	diff2 \|	blob \| history