]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f36b01 a7d1f1b)
Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 20 Jan 2006 00:53:02 +0000 (16:53 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 20 Jan 2006 00:53:02 +0000 (16:53 -0800)

Trivial merge
Linux 2.6 source tree