Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Feb 2007 15:45:09 +0000 (07:45 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Feb 2007 15:45:09 +0000 (07:45 -0800)
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] fix compile errors


Trivial merge