commit | 21c562e39c5927ce8408f5ec8680f98e9df1e9e3 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jun 14 18:37:05 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jun 14 18:37:05 2007 -0700 |
tree | ccec46f9ff2041a52397e8c17f88bcfe6b577c4f | |
parent | aba297927d1d558c7a94548135133bdf9172708a [diff] | |
parent | 9b01bd5b284bbf519b726b39f1352023cb5e9e69 [diff] |
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