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)
commitd3dcc2cb2cd86b1db68f0d87d610f1f14406f928
tree683a5a59cfba1584b4f89cdd9c2f6228ffe7cfd2
parentce27002078e1e65c64395c0a3348786c974306cf
parente047d1cfc3cd79f75e7dda9ffb28b456f6936864
Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] fix compile errors