From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 1 Jun 2009 19:06:21 +0000 (+0200)
Subject: Merge branch 'linus' into irq/numa
X-Git-Tag: v2.6.31-rc1~423^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d58f48ba05caed9118bce62b3047f8683438835;p=pandora-kernel.git

Merge branch 'linus' into irq/numa

Conflicts:
	arch/mips/sibyte/bcm1480/irq.c
	arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

3d58f48ba05caed9118bce62b3047f8683438835
Reading git-diff-tree failed