]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
1  2 
include/linux/pci_ids.h

Simple merge