Merge davem@outer-richmond.davemloft.net:src/GIT/net-2.6/
authorDavid S. Miller <davem@sunset.davemloft.net>
Sat, 10 Sep 2005 18:01:33 +0000 (11:01 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sat, 10 Sep 2005 18:01:33 +0000 (11:01 -0700)

Trivial merge