Merge tag 'drm-intel-next-2014-11-21-fixed' of git://anongit.freedesktop.org/drm...