tree e15ec482773e28babab19c0edc25bcb90a5f802b
parent 3a93dc42f56c507d1034273d1e1d6f9b3ad94bb1
parent 44a207fc66c13c82f627178f9f858b8f3e76028f
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1203474597 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1203474597 -0800

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 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