]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd8bcb83a805c30ed60665f2e2d6a70dc29a6e24e
tree03378c3de4e70285488f1571956d99b254748260
parent33ff19913b282e2d969afd334d8982e844cb90ff
parent6d2280c81f2451f87d693f89f41e1f69c3ab29af
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