From: Linus Torvalds Date: Thu, 21 Jun 2007 22:59:11 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=79d9a72f87d0a6f910be262a9dd4c36e96972a92;p=linux-beck.git 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