diff --git a/[refs] b/[refs]
index f6f5e1eff94c..2df34bcd3af5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4eff7291c977308989b24fdfc7215a501302e6a
+refs/heads/master: df25e164878836196ee93d1a5757867da6eac30e
diff --git a/trunk/drivers/net/e1000/e1000_osdep.h b/trunk/drivers/net/e1000/e1000_osdep.h
index 970c656a517c..2efa3b1b64dc 100644
--- a/trunk/drivers/net/e1000/e1000_osdep.h
+++ b/trunk/drivers/net/e1000/e1000_osdep.h
@@ -42,7 +42,12 @@
 #include <linux/sched.h>
 
 #ifndef msec_delay
-#define msec_delay(x) msleep(x)
+#define msec_delay(x)	do { if(in_interrupt()) { \
+				/* Don't mdelay in interrupt context! */ \
+	                	BUG(); \
+			} else { \
+				msleep(x); \
+			} } while(0)
 
 /* Some workarounds require millisecond delays and are run during interrupt
  * context.  Most notably, when establishing link, the phy may need tweaking