Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
authorDave Airlie <airlied@redhat.com>
Thu, 16 Dec 2010 00:03:47 +0000 (10:03 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 16 Dec 2010 00:03:47 +0000 (10:03 +1000)
commit044102798ddb0a0e5f43ef7fe0ad0e84b0b5e3a0
treefd3a6692ca2aae38d9c86988a95bd1983ea81ebf
parenta4851d8f7d6351a395d36ae8fdcf41745a832d76
parent448f53a1ede54eb854d036abf54573281412d650
Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes

* 'intel/drm-intel-fixes' of /ssd/git/drm-next:
  drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks
  agp/intel: Fix missed cached memory flags setting in i965_write_entry()
  drm/i915/sdvo: Only use the SDVO pin if it is in the valid range
  drm/i915/ringbuffer: Handle wrapping of the autoreported HEAD
  drm/i915/dp: Fix I2C/EDID handling with active DisplayPort to DVI converter