Merge tag 'drm-intel-fixes-2013-11-12' of git://people.freedesktop.org/~danvet/drm...
authorDave Airlie <airlied@redhat.com>
Wed, 13 Nov 2013 23:52:44 +0000 (09:52 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 13 Nov 2013 23:52:44 +0000 (09:52 +1000)
commitb95b49168fc53d1fe5cf0dd4c5e89e927980f9ad
treefc55b1aad2b8384934b593f8b23da1bf50972442
parent792e6a6cb2314005483ca5922082e1f4ae2721b2
parent1dca220b2b6ba605bff07c4d019dd2cd2d70036c
Merge tag 'drm-intel-fixes-2013-11-12' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

Just one patch to fix compile fail for CONFIG_ACPI=n. Figured I better
send this out quickly to minimize the broken build span. Otherwise no
bugfixes (besides some bdw stuff) anywhere in sight.

* tag 'drm-intel-fixes-2013-11-12' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915/opregion: fix build error on CONFIG_ACPI=n