tree 1a7b84871da0f2ebad48c6838f66fbe91cc26995
parent 86a930d5e9702391f6f997366686a48885f21513
parent 7f0801e566cc78315e5dc383bf3c3b5b5b436048
author Daniel Vetter <daniel.vetter@ffwll.ch> 1426848239 +0100
committer Daniel Vetter <daniel.vetter@ffwll.ch> 1426848274 +0100

Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next

Backmerge because of numerous and interleaving conflicts and git
rerere getting confused a bit too often.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

All conflicts are because of -next patches backported to -fixes, so
just go with the code in -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>