Merge tag 'topc/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel...