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

author	Dave Airlie <airlied@redhat.com>
	Mon, 20 Apr 2015 01:32:26 +0000 (11:32 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Mon, 20 Apr 2015 03:05:20 +0000 (13:05 +1000)
commit	ccd946c6d4ecdeea77180ef0b5c28b158500d32f
tree	6186a6458c3c160385d794a23eaf07c786a9e61b	tree \| snapshot
parent	4518c02002cf603b85fc531ece9b4ca23797b6a6	commit \| diff
parent	16e4b7148a398ce562ae3abbbf533f907c8d0b0b	commit \| diff

Merge Linus master into drm-next

The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.

I've included the patch into the merge to fix the build.

Signed-off-by: Dave Airlie <airlied@redhat.com>

Linux Kernel Source Tree.

RSS Atom

Documentation/DocBook/drm.tmpl	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_trace.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/dsi/dsi_host.c	diff1 \|	\|	blob \| history