]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'drm-intel-fixes-2016-03-03' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 4 Mar 2016 03:51:53 +0000 (13:51 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 4 Mar 2016 03:51:53 +0000 (13:51 +1000)
commit09e2d44b4d0bf9f2cf645e4dae5aac42082b053f
tree3853bfbcb6790bfe7866abda9238d62136e86afa
parentded444024b753e9acef2d09484e216ef8da1c5ad
parent4225a70c49a5bfc178b12f8936f9ba58e62ab1c3
Merge tag 'drm-intel-fixes-2016-03-03' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Small conflict as I had the balance in my tree already for testing.

* tag 'drm-intel-fixes-2016-03-03' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Balance assert_rpm_wakelock_held() for !IS_ENABLED(CONFIG_PM)
  drm/i915/skl: Fix power domain suspend sequence