tree ae797a7f4af39f80e77526533d06ac23b439f0ab
parent b3e3b302cf6dc8d60b67f0e84d1fa5648889c038
parent 8c083f081d0014057901c68a0a3e0f8ca7ac8d23
author Thomas Gleixner <tglx@linutronix.de> 1237816203 +0100
committer Thomas Gleixner <tglx@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 <tglx@linutronix.de>