summaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-02 17:23:13 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-02 17:23:13 -0800
commit2de6c39f389f25442389c3ab0f2d9b50e3f4a77d (patch)
tree03378c3de4e70285488f1571956d99b254748260 /arch/i386
parent0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed (diff)
parent4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 (diff)
downloadop-kernel-dev-2de6c39f389f25442389c3ab0f2d9b50e3f4a77d.zip
op-kernel-dev-2de6c39f389f25442389c3ab0f2d9b50e3f4a77d.tar.gz
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
Diffstat (limited to 'arch/i386')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud