projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0b0e0b5
4fa2eee
)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
author
Linus Torvalds
<torvalds@g5.osdl.org>
Fri, 3 Nov 2006 01:23:13 +0000
(17:23 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Fri, 3 Nov 2006 01:23:13 +0000
(17:23 -0800)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pci_ids.h: Add NVIDIA PCI ID
Trivial merge