Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 9 Apr 2007 18:45:18 +0000 (11:45 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 9 Apr 2007 18:45:18 +0000 (11:45 -0700)
* 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] intel_agp: PCI id update for Intel 965GM


Trivial merge