diff options
| author | Dave Airlie | 2016-03-04 13:51:53 +1000 |
|---|---|---|
| committer | Dave Airlie | 2016-03-04 13:51:53 +1000 |
| commit | 0dff9738ec6dddf701821a6aa477ced809f17ef0 (patch) | |
| tree | 3853bfbcb6790bfe7866abda9238d62136e86afa /include/drm | |
| parent | f0511e66114a6414cfca92d7b94118913a0c11ff (diff) | |
| parent | eda908967feecf7575a8ab74f1695b0445cf324e (diff) | |
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
Diffstat (limited to 'include/drm')
0 files changed, 0 insertions, 0 deletions