Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 26 May 2006 22:13:33 +0000 (15:13 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 26 May 2006 22:13:33 +0000 (15:13 -0700)
commitecd68853b852cdafb138f9c437f3a751fe7dc381
tree6b3a3468d0d3dca7f226de7e3551913d907b17a2
parent087377a4307e18225f6452af5e71fe763c088c4e
parent3041a069090224462e27da1bc9483b463eb40841
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