Merge branches 'irq/genirq', 'irq/sparseirq' and 'irq/urgent' into irq/core

diff --cc arch/arm/kernel/irq.c
Simple merge

diff --cc arch/blackfin/kernel/irqchip.c
Simple merge

diff --cc arch/mips/kernel/irq.c
index a0ff2b66e22b453f23d909959d3c37694cd5fd80,a0ff2b66e22b453f23d909959d3c37694cd5fd80,7b845ba9dff4cf565394393dbb1e24f497e5aed4,a0ff2b66e22b453f23d909959d3c37694cd5fd80..7c2dafa0f584c4e7a6a82069355c3779ba09e2a1
--- 1/arch/mips/kernel/irq.c
--- 2/arch/mips/kernel/irq.c
--- 3/arch/mips/kernel/irq.c
--- 4/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@@@@ -108,10 -108,10 -108,9 -108,10 +108,10 @@@@@ int show_interrupts(struct seq_file *p
                seq_printf(p, "%10u ", kstat_irqs(i));
    #else
                for_each_online_cpu(j)
-- -                    seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
++ +                    seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
    #endif
                seq_printf(p, " %14s", irq_desc[i].chip->name);
  +             seq_printf(p, "-%-8s", irq_desc[i].name);
                seq_printf(p, "  %s", action->name);
    
                for (action=action->next; action; action = action->next)

diff --cc arch/sparc/kernel/irq_64.c
Simple merge

diff --cc arch/sparc/kernel/time_64.c
Simple merge

diff --cc kernel/irq/chip.c
Simple merge

diff --cc kernel/irq/handle.c
Simple merge

diff --cc kernel/irq/manage.c
Simple merge

diff --cc kernel/irq/numa_migrate.c
Simple merge