]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc8ccb02d6033523c452be6d2ce87c775a18f343c
treedb3ff3b5edc305a0352b69327b914ef3a92e05a5
parentac139c796ed0f5e80150973e9b06223f33de42c3
parent622d63ebfe1a92b8e13a3210df94fa510c145a8c
Merge remote-tracking branch 'airlied/drm-next' into HEAD

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>
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