git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 11 Sep 2014 12:46:53 +0000 (14:46 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 11 Sep 2014 12:46:53 +0000 (14:46 +0200)
commit	18f7b911bdc3dfc2550f94fed25ce84cdfeaf995
tree	4ddb4d1c5d2b67fb096c72e41d2a03b01a605041	tree \| snapshot
parent	96ecf4aa3c5c3219a197ca3c55f585d62ae5af87	commit \| diff
parent	58ee3d777f1c1e513d2923c2a6c4836c0ab68a9d	commit \| diff

Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework

Dave asked me to do the backmerge before sending him the revised pull
request, so here we go. Nothing fancy in the conflicts, just a few
things changed right next to each another.

Conflicts:
drivers/gpu/drm/drm_irq.c

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

Linux Kernel Source Tree.

RSS Atom

Documentation/DocBook/drm.tmpl	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_pm.c	diff1 \|	diff2 \|	blob \| history
include/drm/drmP.h	diff1 \|	diff2 \|	blob \| history