Merge tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm...
[pandora-kernel.git] / include / drm / drm_crtc.h
Simple merge