review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.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	8cbf3202098f191f8b0a0606b2df0af047f21fe5
tree	8e49e81e1879de78fcd6ac64041b9a72db06caec	tree \| snapshot
parent	04feced98a434c7046108671dc5b6f50f3b63ed7	commit \| diff
parent	c39b06951f1dc2e384650288676c5b7dcc0ec92c	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>

Domain: System / Kernel;

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