Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 20 Feb 2008 02:29:57 +0000 (18:29 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 20 Feb 2008 02:29:57 +0000 (18:29 -0800)
commit5d9c4a7de64d398604a978d267a6987f1f4025b7
treee15ec482773e28babab19c0edc25bcb90a5f802b
parent3a93dc42f56c507d1034273d1e1d6f9b3ad94bb1
parent44a207fc66c13c82f627178f9f858b8f3e76028f
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
arch/x86/mm/ioremap.c