Merge branch 'drm-intel-fixes' into drm-intel-next

Apply the SandyBridge stability fixes from -fixes.