Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 00:20:55 +0000 (16:20 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 00:20:55 +0000 (16:20 -0800)
commit10379a25fee8ddc8698d2f6c54ccedd4664c2941
treefba7fe3a1aa8e85104f9dcf08ff217dd4b0160c4
parent63b3ced0f80ae1c437620d3f7d6ff2bcf0745b0a
parent3b0e8eadc511eaceba6d6b8d0743359a34ee23c6
Merge /pub/scm/linux/kernel/git/davej/agpgart
include/linux/pci_ids.h