Merge tag 'drm-intel-next-fixes-2015-06-11' of...

Merge tag 'drm-intel-next-fixes-2015-06-11' of git://anongit.freedesktop.org/drm-intel into drm-next

firmware name fix

* tag 'drm-intel-next-fixes-2015-06-11' of git://anongit.freedesktop.org/drm-intel:
  drm/i915/skl: Fix DMC API version in firmware file name

drivers/gpu/drm/i915/intel_csr.c

@@ -41,7 +41,7 @@
  * be moved to FW_FAILED.
  */
 
-#define I915_CSR_SKL "i915/skl_dmc_ver4.bin"
+#define I915_CSR_SKL "i915/skl_dmc_ver1.bin"
 
 MODULE_FIRMWARE(I915_CSR_SKL);