projects / powerpc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 087377a 3041a06)
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)
* 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


Trivial merge
DSM-G600 Linux 2.6