Merge branch 'cpus4096' into irq/threaded
authorThomas Gleixner <tglx@linutronix.de>
Mon, 23 Mar 2009 13:50:03 +0000 (14:50 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 23 Mar 2009 20:20:20 +0000 (21:20 +0100)
Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Trivial merge