diff --git a/[refs] b/[refs]
index 08f2318b9ac9..de0bc49b9900 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2daeabf62a5fb205d413c35cf604021db17536b
+refs/heads/master: 1b614fb9a00e97b1eab54d4e442d405229c059dd
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index 9675f312830d..df30feb2fc72 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -740,7 +740,7 @@ int netpoll_setup(struct netpoll *np)
 				       np->name);
 				break;
 			}
-			cond_resched();
+			msleep(1);
 		}
 
 		/* If carrier appears to come up instantly, we don't