From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 23 Mar 2009 13:50:03 +0000 (+0100)
Subject: Merge branch 'cpus4096' into irq/threaded
X-Git-Tag: v2.6.30-rc1~3^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80c5520811d3805adcb15c570ea5e2d489fa5d0b;p=pandora-kernel.git

Merge branch 'cpus4096' into irq/threaded

Conflicts:
	arch/parisc/kernel/irq.c
	kernel/irq/handle.c

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

80c5520811d3805adcb15c570ea5e2d489fa5d0b
Reading git-diff-tree failed