From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 21 Jun 2007 22:59:11 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
X-Git-Tag: v2.6.22-rc6~41
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79d9a72f87d0a6f910be262a9dd4c36e96972a92;p=linux-2.6

Merge master.kernel.org:/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
---

79d9a72f87d0a6f910be262a9dd4c36e96972a92