Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 1 Oct 2006 07:40:55 +0000 (00:40 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 1 Oct 2006 07:40:55 +0000 (00:40 -0700)
commit82965addad66fce61a92c5f03104ea90b0b87124
treeb099c6ef559ea7790b84df5ce34fa54bca46e24f
parentf0b364a13d7fba001c0571d954f165dfaf5f434a
parent2cc1a4134f51b4aff7c7486d857e6773f493e370
Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] printk fixups.
  [AGPGART] Use pci_get_slot not pci_find_slot