diff --git a/[refs] b/[refs]
index fa3939368ba3..51b240c0e9c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f6c0c2bf1d4cc626588ca6f8dc642df34c0d26d
+refs/heads/master: c2dc988ec566429841dd83644479aca78a6251e7
diff --git a/trunk/arch/parisc/kernel/entry.S b/trunk/arch/parisc/kernel/entry.S
index ba86f610e76f..293ba44f40a3 100644
--- a/trunk/arch/parisc/kernel/entry.S
+++ b/trunk/arch/parisc/kernel/entry.S
@@ -997,13 +997,6 @@ intr_restore:
 
 	rfi
 	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
 
 #ifndef CONFIG_PREEMPT
 # define intr_do_preempt	intr_restore