Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 02:53:04 +0000 (18:53 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 02:53:04 +0000 (18:53 -0800)
commit3641b536ecc56f68fe182ac99f7ddc4827125118
tree8bb025f9e981588c09aeb13b1a7c117036c4e703
parentb1ef951e8199d1c59f14dbe0fa22974ed57a3b48
parentf0eef25339f92f7cd4aeea23d9ae97987a5a1e82
Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] VIA and SiS AGP chipsets are x86-only
  [AGPGART] agp-amd64: section mismatches with HOTPLUG=n
  [AGPGART] Fix up misprogrammed bridges with incorrect AGPv2 rates.