]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
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