From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 5 Feb 2008 17:54:10 +0000 (-0800)
Subject: Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.25-rc1~789
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9914712e2e0f80ddcc00c928d3f7a5848d925e1e;p=~emulex%2Finfiniband.git

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: remove flush_agp_mappings calls from new flush handling code
  intel-agp: introduce IS_I915 and do some cleanups..
  [intel_agp] fix name for G35 chipset
  intel-agp: fixup resource handling in flush code.
  intel-agp: add new chipset ID
  agp: remove unnecessary pci_dev_put
  agp: remove uid comparison as security check
  fix AGP warning
  agp/intel: Add chipset flushing support for i8xx chipsets.
  intel-agp: add chipset flushing support
  agp: add chipset flushing support to AGP interface
---

9914712e2e0f80ddcc00c928d3f7a5848d925e1e