7fb9b457136d6c3ca8ed
parent 4fa2eeeac5e13a8579ee45bc172eed690d28fbb7
author Linus Torvalds <torvalds@g5.osdl.org> 1162516993 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1162516993 -0800

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
ão›Ó˜