Merge tag 'drm-intel-next-fixes-2015-06-22' of git://anongit.freedesktop.org/drm...
authorDave Airlie <airlied@redhat.com>
Tue, 23 Jun 2015 00:22:19 +0000 (10:22 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 23 Jun 2015 00:22:38 +0000 (10:22 +1000)
commitce8e394278e2a487df254d87d049bd3531f48993
treef91dffe91b83161ade0a47df40f834edd0527be9
parent8ffaa90347d80cc20d08c5dd2cdd27dc3fb51b8d
parent9044a81d1be632251b7ee97ce9a0bf2a97989be6
Merge tag 'drm-intel-next-fixes-2015-06-22' of git://anongit.freedesktop.org/drm-intel into drm-next

fix warning introduced in last -fixes
* tag 'drm-intel-next-fixes-2015-06-22' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Silence compiler warning