Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 21 Jun 2007 22:59:11 +0000 (15:59 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 21 Jun 2007 22:59:11 +0000 (15:59 -0700)
commit79d9a72f87d0a6f910be262a9dd4c36e96972a92
treee3725f6f92011847a5cf50fabe1e3bede51517cd
parent9738cbe32192919356397f1e24f9b26e1f574fbb
parent47d46379eb66278107947729e34a833c76dca252
Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] intel_agp: don't load if no IGD and AGP port