]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89fbb69 64a0c1c)
Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6
authorArnaldo Carvalho de Melo <acme@mandriva.com>
Sat, 29 Oct 2005 01:35:02 +0000 (23:35 -0200)
committerArnaldo Carvalho de Melo <acme@mandriva.com>
Sat, 29 Oct 2005 01:35:02 +0000 (23:35 -0200)

Trivial merge
Linux 2.6 source tree