From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 20 Feb 2008 02:29:57 +0000 (-0800)
Subject: Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: firefly_0821_release~22367
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d9c4a7de64d398604a978d267a6987f1f4025b7;p=firefly-linux-kernel-4.4.55.git

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: fix missing casts that produced a warning.
  agp: add support for 662/671 to agp driver
  fix historic ioremap() abuse in AGP
  agp/sis: Suspend support for SiS AGP
  agp/sis: Clear bit 2 from aperture size byte as well
---

5d9c4a7de64d398604a978d267a6987f1f4025b7