Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 15 May 2007 19:10:26 +0000 (12:10 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 15 May 2007 19:10:26 +0000 (12:10 -0700)
commit0560551dca0c02a4b23f95a9c339882ff291e1c7
treeaf0fa695a2149b5632d91bd28620de10a0dcf2fa
parent1ca9bc4f2ae22741f2a545c1b0c3a042a2d71b11
parentbbdfff86a8f0c91ad8b6dedf74bc14de4ba39679
Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] Fix wrong ID in via-agp.c