| commit | ecd68853b852cdafb138f9c437f3a751fe7dc381 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri May 26 15:13:33 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri May 26 15:13:33 2006 -0700 |
| tree | 6b3a3468d0d3dca7f226de7e3551913d907b17a2 | |
| 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