Merge tag 'drm-intel-next-2014-07-25-merged' of git://anongit.freedesktop.org/drm...