Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 11 Sep 2014 12:46:53 +0000 (14:46 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 11 Sep 2014 12:46:53 +0000 (14:46 +0200)
commit74c29107ed0605561e8693984458e8da97e71fa0
tree4ddb4d1c5d2b67fb096c72e41d2a03b01a605041
parent6ce68b2fc844ed2052660e04d5bf151c60dd6f90
parentcb5be5f144a919e3a8df7c4c7510c09f945c57a4
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>
Documentation/DocBook/drm.tmpl
drivers/gpu/drm/drm_drv.c
drivers/gpu/drm/drm_irq.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/radeon/radeon_display.c
drivers/gpu/drm/radeon/radeon_pm.c
include/drm/drmP.h