From: Linus Torvalds Date: Wed, 20 Feb 2008 01:48:51 +0000 (-0800) Subject: Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3a93dc42f56c507d1034273d1e1d6f9b3ad94bb1;p=linux-beck.git 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. --- 3a93dc42f56c507d1034273d1e1d6f9b3ad94bb1