Merge of davem@nuts.davemloft.net:/disk1/GIT/sparc-2.6/.git/
authorDavid S. Miller <davem@sunset.davemloft.net>
Wed, 25 May 2005 01:08:07 +0000 (18:08 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 25 May 2005 01:08:07 +0000 (18:08 -0700)

Trivial merge