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

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Mon, 15 Aug 2016 08:41:47 +0000 (10:41 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Mon, 15 Aug 2016 08:41:47 +0000 (10:41 +0200)
commit	cc9263874b42bf98209dce0afe698b550648e770
tree	f0eafd344c501e420de06c2e0f29f2ae0e6a9a1b	tree \| snapshot
parent	02bef8f98d26e9774b49c78a42b29b168e8876fc	commit \| diff
parent	fc93ff608b15ae32cde3006b7af860b59cac20ec	commit \| diff

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge because too many conflicts, and also we need to get at the
latest struct fence patches from Gustavo. Requested by Chris Wilson.

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

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

RSS Atom

drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sprite.c	diff1 \|	diff2 \|	blob \| history