merged 3.14.1 i915 driver