From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Aug 2008 15:28:32 +0000 (-0700)
Subject: Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.27-rc3~47
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=88fa08f67bee1a0c765237bdac106a32872f57d2;p=linux-2.6-omap-h63xx.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: fix SIS 5591/5592 wrong PCI id
  intel/agp: rewrite GTT on resume
  agp: use dev_printk when possible
  amd64-agp: run fallback when no bridges found, not when driver registration fails
  intel_agp: official name for GM45 chipset
---

88fa08f67bee1a0c765237bdac106a32872f57d2