diff --git a/[refs] b/[refs]
index f55be6fff287..596737484466 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4609472116bb806a95e98d04767189406c74c70
+refs/heads/master: 316d9679f33caf7e683471647d1472bfe133d858
diff --git a/trunk/kernel/softlockup.c b/trunk/kernel/softlockup.c
index b75b492fbfcf..1a07f8ca4b92 100644
--- a/trunk/kernel/softlockup.c
+++ b/trunk/kernel/softlockup.c
@@ -180,6 +180,10 @@ static void check_hung_task(struct task_struct *t, unsigned long now)
 	if (t->flags & PF_FROZEN)
 		return;
 
+	/* Don't check for tasks waiting on network file systems like NFS */
+	if (t->state & TASK_KILLABLE)
+		return;
+
 	if (switch_count != t->last_switch_count || !t->last_switch_timestamp) {
 		t->last_switch_count = switch_count;
 		t->last_switch_timestamp = now;