Automatic merge of /spare/repo/netdev-2.6 branch smc91x
commit1a9505996dd0c12a2e56d2c6af00846e75a3850d
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 21:15:04 +0000 (4 17:15 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 21:15:04 +0000 (4 17:15 -0400)
tree311e431cad5a6acd09442d92fed36c1bd4d0c54c
parentbdb7a3427be1e31327df0543cc397bf3c994b039
parentea9375607f8b312cf4389d68909330ed32a622ef
Merge ... /spare/repo/netdev-2.6 branch smc91x