tree 3c6823777978ac06bb99a4225b30f10cb7c55938
parent cf8c0d1dbcfaba56adde85b63190a8bceda0cd04
parent feac7af508ebdfe1db9920d4e45d0ffd286abe75
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1203472131 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1203472131 -0800

Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/sis: add pciid for SiS 662/671 chipset
  drm: add new rv380 pciid
  drm: add support for passing state into the suspend hooks.
  drm/i915: Fix hibernate save/restore of VGA attribute regs
  drm/i915 more registers for S3 (DSPCLK_GATE_D, CACHE_MODE_0, MI_ARB_STATE)
  drm/i915: restore pipeconf regs unconditionally
  drm/i915: save/restore interrupt state
  drm: convert drm from nopage to fault.
  i915: wrap chipset types requiring hw status set ioctl
  drm/radeon: add initial rs690 support to drm.