Automatic merge of /spare/repo/netdev-2.6 branch iff-running
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 21:11:28 +0000 (17:11 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 21:11:28 +0000 (17:11 -0400)
1  2 
drivers/net/tlan.c

Simple merge