Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 8 Mar 2016 01:08:15 +0000 (12:08 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 8 Mar 2016 01:08:15 +0000 (12:08 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 01:08:15 +0000 (12:08 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 01:08:15 +0000 (12:08 +1100)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
diff --cc drivers/gpu/drm/panel/panel-simple.c
Simple merge
diff --cc include/drm/drm_crtc.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 8 Mar 2016 01:08:15 +0000 (12:08 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 8 Mar 2016 01:08:15 +0000 (12:08 +1100)
		1	2
Documentation/devicetree/bindings/vendor-prefixes.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panel/panel-simple.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/drm/drm_crtc.h	patch \|	diff1 \|	diff2 \|	blob \| history