Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 3 Nov 2006 01:23:13 +0000 (17:23 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 3 Nov 2006 01:23:13 +0000 (17:23 -0800)
commit2de6c39f389f25442389c3ab0f2d9b50e3f4a77d
tree03378c3de4e70285488f1571956d99b254748260
parent0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed
parent4fa2eeeac5e13a8579ee45bc172eed690d28fbb7
Merge branch 'upstream-linus' of /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