Merge davem@outer-richmond.davemloft.net:src/GIT/net-2.6/
David S. Miller [Sat, 10 Sep 2005 18:01:33 +0000 (11:01 -0700)]

Trivial merge