From: Dave Airlie <airlied@redhat.com>
Date: Fri, 12 Jun 2015 00:16:36 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-fixes-2015-06-11' of git://anongit.freedesktop.org/drm... 
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~17^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c70c464787febc67c40b13f2fedccc378b0fa8e;p=pandora-kernel.git

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
---

5c70c464787febc67c40b13f2fedccc378b0fa8e
Reading git-diff-tree failed