Merge branch 'smp' into misc

Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/mm/ioremap.c
This commit is contained in:
Russell King
2011-01-06 22:31:35 +00:00
1391 changed files with 25607 additions and 12357 deletions

View File

@@ -18,7 +18,7 @@ struct seq_file;
* This is internal. Do not use it.
*/
extern void init_FIQ(void);
extern int show_fiq_list(struct seq_file *, void *);
extern int show_fiq_list(struct seq_file *, int);
#ifdef CONFIG_MULTI_IRQ_HANDLER
extern void (*handle_arch_irq)(struct pt_regs *);