From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 15 Jun 2007 01:37:05 +0000 (-0700)
Subject: Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.22-rc5~35
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21c562e39c5927ce8408f5ec8680f98e9df1e9e3;p=linux-2.6

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: fix radeon setparam on 32/64 bit systems.
  drm/i915:  Add support for the G33, Q33, and Q35 chipsets.
  i915: add new pciids for 945GME, 965GME/GLE
---

21c562e39c5927ce8408f5ec8680f98e9df1e9e3