diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-26 18:13:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-26 18:13:33 -0400 |
| commit | ecd68853b852cdafb138f9c437f3a751fe7dc381 (patch) | |
| tree | 6b3a3468d0d3dca7f226de7e3551913d907b17a2 /include/linux/pci_ids.h | |
| parent | 087377a4307e18225f6452af5e71fe763c088c4e (diff) | |
| parent | 3041a069090224462e27da1bc9483b463eb40841 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: dev.c comment fixes
[IPV6] ROUTE: Don't try less preferred routes for on-link routes.
[IRDA]: *_DONGLE should depend on IRTTY_SIR
[MAINTAINERS]: Add entry for netem
Diffstat (limited to 'include/linux/pci_ids.h')
0 files changed, 0 insertions, 0 deletions