Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
commit51e6ed23fc95c3e710d8a98717924ccb2571aa66
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 30 Jan 2007 16:43:26 +0000 (30 08:43 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 30 Jan 2007 16:43:26 +0000 (30 08:43 -0800)
tree2e7b2aae718de89e31384bc133e8752da642f5ae
parent597049ccd729e80c5eff7d907beeb58d908aac6f
parent43ed41f648554c9fecaf7597d25e05da63ec7290
Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] Add new IDs to VIA AGP.
  [AGPGART] Remove pointless assignment.
  [AGPGART] Remove pointless typedef in ati-agp
  [AGPGART] Prevent (unlikely) memory leak in amd_create_gatt_pages()
  [AGPGART] intel_agp: restore graphics device's pci space early in resume
include/linux/pci_ids.h