diff --git a/[refs] b/[refs]
index 8cde7269c7c6..03ea56601ab2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9c1528a429c831458e54c8701a0b80ba563a7a8
+refs/heads/master: 4d3eeeac97a6e4fc1ff3ad184f1c3bf328de7cb6
diff --git a/trunk/arch/avr32/kernel/kprobes.c b/trunk/arch/avr32/kernel/kprobes.c
index ca41fc1edbe1..d0abbcaf1c1e 100644
--- a/trunk/arch/avr32/kernel/kprobes.c
+++ b/trunk/arch/avr32/kernel/kprobes.c
@@ -154,6 +154,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
 	return 1;
 
 no_kprobe:
+	preempt_enable_no_resched();
 	return ret;
 }