From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 26 May 2006 22:13:33 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: firefly_0821_release~35645
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ecd68853b852cdafb138f9c437f3a751fe7dc381;p=firefly-linux-kernel-4.4.55.git

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
---

ecd68853b852cdafb138f9c437f3a751fe7dc381