Merge tag 'drm-intel-next-fixes-2015-06-11' of git://anongit.freedesktop.org/drm...
authorDave Airlie <airlied@redhat.com>
Fri, 12 Jun 2015 00:16:36 +0000 (10:16 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 12 Jun 2015 00:16:36 +0000 (10:16 +1000)
commit5c70c464787febc67c40b13f2fedccc378b0fa8e
tree85f347ae9252a643703216dc6c7d7e60ac70fb7e
parent933ea180a4ff0396152979874937bb8d954a2cee
parentbf546f8158e2df2656494a475e6235634121c87c
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