Merge branch 'misc' into for-linus

Conflicts: arch/arm/kernel/ptrace.c
2012-05-21 15:15:24 +01:00
parent ddf90a2ff2 0ec8e7aa8f
commit 4175160b06
37 changed files with 268 additions and 173 deletions
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -589,6 +589,8 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
 	 */
 	block_sigmask(ka, sig);

+	tracehook_signal_handler(sig, info, ka, regs, 0);
+
 	return 0;
 }