Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 00:24:56 +0000 (17:24 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 00:24:56 +0000 (17:24 -0700)
commit0bce0b7a3b25b33220be77dcaf3dc4585641100c
tree276c0a66993b047b978c1aebc19060dcf8fc61cf
parentc3474be4ddcae0256a13cbbe35d849c153c4ec4b
parent52ea0718ea506df0915eacedb439e65c5f214e0e
Merge branch 'for-2.6.21' of /linux/kernel/git/davej/agpgart

* 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] intel_agp: fix G965 GTT size detect