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

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

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 9 Apr 2014 12:33:47 +0000 (14:33 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 9 Apr 2014 12:33:47 +0000 (14:33 +0200)
commit	973f73fcd7eedfa52770fea2f894398da13c5e2e
tree	8e49e81e1879de78fcd6ac64041b9a72db06caec	tree \| snapshot
parent	3a7644bc5cee253304a3740a482351650a3670d4	commit \| diff
parent	1c468fab5efe1dba41137450b4888bd03e2eca34	commit \| diff

Merge remote-tracking branch 'airlied/drm-next' into HEAD

Backmerge drm-next after the big s/crtc->fb/crtc->primary->fb/
cocinelle patch to avoid endless amounts of conflict hilarity in my
-next queue for 3.16.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/i915/dvo_ns2501.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_cmd_parser.c	diff1 \|	diff2 \|	blob \| history
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_gtt.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/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
include/drm/drmP.h	diff1 \|	diff2 \|	blob \| history