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)
commit90f30eccf41302a2542f5d374af243061902bd98
tree0cd12b5fd0cb7665e165eabbc0b460dbd6765acd
parentc2481cc4a8727141474472cb1301fce989ce0865
parent4598af33d9143942f00cf7692b247027aba35316
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: PCI id update for Intel 965GM