Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 11 Jun 2007 18:39:05 +0000 (11:39 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 11 Jun 2007 18:39:05 +0000 (11:39 -0700)
commit3334500b460a5eede2e3466ca97a90fe3b91ceb5
tree970829ec5116abcaf237be5214b89638404554be
parent72f60acb01fc7ef135d3181ba9235c9ef0ab68ea
parent874808c6dd429f7431b906a32c7f78a68e7636af
Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] intel_agp: Add support for G33, Q33 and Q35 chipsets
  [AGPGART] intel_agp: add support for 945GME
  [AGPGART] intel_agp: add support for 965GME/GLE
  [AGPGART] intel_agp: use table for device probe
  [AGPGART] intel_agp: cleanup intel private data