Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542
authorDavid S. Miller <davem@outer-richmond.davemloft.net>
Sat, 10 Sep 2005 07:10:49 +0000 (00:10 -0700)
committerDavid S. Miller <davem@outer-richmond.davemloft.net>
Sat, 10 Sep 2005 07:10:49 +0000 (00:10 -0700)

Trivial merge