From: Linus Torvalds <torvalds@g5.osdl.org>
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: v3.12-rc1~31920^2~20^2~239
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2de6c39f389f25442389c3ab0f2d9b50e3f4a77d;p=kernel%2Fkernel-generic.git

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
---

2de6c39f389f25442389c3ab0f2d9b50e3f4a77d