| commit | 2de6c39f389f25442389c3ab0f2d9b50e3f4a77d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Nov 02 17:23:13 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Nov 02 17:23:13 2006 -0800 |
| tree | 03378c3de4e70285488f1571956d99b254748260 | |
| parent | 0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed [diff] | |
| parent | 4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 [diff] |
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