Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)

Trivial merge