From: Linus Torvalds Date: Fri, 3 Nov 2006 01:23:13 +0000 (-0800) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.19-rc5~61 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2de6c39f389f25442389c3ab0f2d9b50e3f4a77d;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: pci_ids.h: Add NVIDIA PCI ID --- 2de6c39f389f25442389c3ab0f2d9b50e3f4a77d