]> git.hungrycats.org Git - linux/commitdiff
Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6
authorDavid S. Miller <davem@kernel.bkbits.net>
Thu, 12 Aug 2004 13:27:51 +0000 (06:27 -0700)
committerDavid S. Miller <davem@kernel.bkbits.net>
Thu, 12 Aug 2004 13:27:51 +0000 (06:27 -0700)
into kernel.bkbits.net:/home/davem/sparc-2.6


Trivial merge