| commit | ecd68853b852cdafb138f9c437f3a751fe7dc381 | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Fri, 26 May 2006 22:13:33 +0000 (26 15:13 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Fri, 26 May 2006 22:13:33 +0000 (26 15:13 -0700) | ||
| tree | 6b3a3468d0d3dca7f226de7e3551913d907b17a2 | treesnapshot (tar.gz zip) |
| parent | 087377a4307e18225f6452af5e71fe763c088c4e | commitdiff |
| parent | 3041a069090224462e27da1bc9483b463eb40841 | commitdiff |
Merge /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
* 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