Merge bk://linux-dj.bkbits.net/agpgart
commitda2def39ab0ab53286831929a4e2b691c6b63db0
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 19 Oct 2004 05:05:46 +0000 (18 22:05 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 19 Oct 2004 05:05:46 +0000 (18 22:05 -0700)
treeae3a10743916c3cb31b6ba0db2dcb36157ed65b3
parent82718086b091a136047dab266c5487b07ea7cf00
parentc684195ea577f5575dfae2b23a9de85d2f3064c6
Merge bk://linux-dj.bkbits.net/agpgart
into ppc970.osdl.org:/home/torvalds/v2.6/linux
include/linux/pci_ids.h