]> err.no Git - linux-2.6/commitdiff
Automatic merge of /spare/repo/netdev-2.6 branch smc91x
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 21:15:04 +0000 (17:15 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 21:15:04 +0000 (17:15 -0400)

Trivial merge