]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0db3dc7 5131a18)
Merge master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 29 Jun 2007 04:21:43 +0000 (21:21 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 29 Jun 2007 04:21:43 +0000 (21:21 -0700)

Trivial merge
Linux 2.6 source tree