commit 3506ba7b082f9330657b3386c98246d5fda6c698
author Linus Torvalds <torvalds@linux-foundation.org> Wed Jun 18 21:52:35 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Jun 18 21:52:35 2008 -0700
tree 52bddb8c38a5065002769842d53a9f75ac96f20b
parent f9d1c6ca2bb1bbfde4a95d9e55ab3b0126825295
parent 62c96b9d0917894c164aa3e474a3ff3bca1554ae

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/intel: cleanup some serious whitespace badness
  [AGP] intel_agp: Add support for Intel 4 series chipsets
  [AGP] intel_agp: extra stolen mem size available for IGD_GM chipset
  agp: more boolean conversions.
  drivers/char/agp - use bool
  agp: two-stage page destruction issue
  agp/via: fixup pci ids