Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 25 Aug 2007 15:01:53 +0000 (08:01 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 25 Aug 2007 15:01:53 +0000 (08:01 -0700)
commit6ae26fa468533c86aaa6936fd366142fcf01386f
treee1b5df138d0a3775b6546f2437950eb4fd635d6a
parent6869ce1c145aaea9f9f8eb8623a261d316b0cd19
parent5bdbc7dc2c07d507b41bffdadc2c8cc13b2d4326
Merge branch 'agp-patches' of git://git./linux/kernel/git/airlied/agp-2.6

* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp: balance ioremap checks
  agp: Add device id for P4M900 to via-agp module
  efficeon-agp leaks 'struct agp_bridge_data' in error paths of agp_efficeon_probe()
include/linux/pci_ids.h