Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus

2011-10-25 08:19:29 +01:00
parent c3b92c8787 7816e210a7 f73765fcb8 70e5f5efcc 91c2ebb90b daece59689 d7c5d0dcff a06f916b7a
commit 06afb1a087
76 changed files with 1282 additions and 721 deletions
--- a/arch/arm/include/asm/localtimer.h
+++ b/arch/arm/include/asm/localtimer.h
@@ -24,6 +24,10 @@ void percpu_timer_setup(void);
 */
 asmlinkage void do_local_timer(struct pt_regs *);

+/*
+ * Called from C code
+ */
+void handle_local_timer(struct pt_regs *);

 #ifdef CONFIG_LOCAL_TIMERS