@linutronix.de> 1237839620 +0100 Merge branch 'cpus4096' into irq/threaded Conflicts: arch/parisc/kernel/irq.c kernel/irq/handle.c Signed-off-by: Thomas Gleixner 򦅼&x