Merge remote-tracking branch 'airlied/drm-next' into HEAD
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Nov 2014 09:55:35 +0000 (10:55 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Nov 2014 09:55:35 +0000 (10:55 +0100)
Backmerge drm-next so that I can keep merging patches. Specifically I
want:
- atomic stuff, yay!
- eld parsing patch from Jani.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
1  2 
Documentation/DocBook/drm.tmpl
drivers/gpu/drm/drm_plane_helper.c
drivers/gpu/drm/i915/i915_cmd_parser.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_lrc.c

Simple merge
Simple merge
Simple merge
Simple merge