diff options
author | Chris Wilson | 2011-02-16 10:36:05 +0100 |
---|---|---|
committer | Chris Wilson | 2011-02-16 10:44:30 +0100 |
commit | 9035a97a32836d0e456ddafaaf249a844e6e4b5e (patch) | |
tree | 41ec3db083bdb46cd831f0d39db1fe294ae7d55f /drivers/gpu/drm/i915/intel_bios.c | |
parent | drm/i915: Move the lvds OpRegion lid detection code to panel and reuse for eDP (diff) | |
parent | agp/intel: Experiment with a 855GM GWB bit (diff) | |
download | kernel-qcow2-linux-9035a97a32836d0e456ddafaaf249a844e6e4b5e.tar.gz kernel-qcow2-linux-9035a97a32836d0e456ddafaaf249a844e6e4b5e.tar.xz kernel-qcow2-linux-9035a97a32836d0e456ddafaaf249a844e6e4b5e.zip |
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
0 files changed, 0 insertions, 0 deletions