From: Linus Torvalds Date: Fri, 20 Jun 2008 19:37:55 +0000 (-0700) Subject: Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Tag: v2.6.26-rc7~5 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdfe6d3d000775b50fb1adbc278ba0a34c3007c7;p=linux-2.6 Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 * 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: [agp]: fixup chipset flush for new Intel G4x. agp: brown paper bag patch - put back the two lines it took out. --- fdfe6d3d000775b50fb1adbc278ba0a34c3007c7