Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
commit5cea11259d19a70c35abcf984cad02be51b8aa48
authorDavid S. Miller <davem@nuts.davemloft.net>
Mon, 31 May 2004 11:03:57 +0000 (31 04:03 -0700)
committerDavid S. Miller <davem@nuts.davemloft.net>
Mon, 31 May 2004 11:03:57 +0000 (31 04:03 -0700)
treea54c65c0cabfbbb48544a07beaea814ad72e4bf5
parent77882f741c3b700a3994eaac358b4d0f58366d02
parentef4c617acb31eebe7e2438b581fd505f48691b0e
Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6