Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

This commit is contained in:
David S. Miller 2009-07-09 20:18:24 -07:00
commit e5a8a896f5
42 changed files with 224 additions and 103 deletions

View file

@ -744,7 +744,7 @@ int netpoll_setup(struct netpoll *np)
np->name);
break;
}
cond_resched();
msleep(1);
}
/* If carrier appears to come up instantly, we don't