From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 17 Dec 2008 12:16:08 +0000 (+0100)
Subject: Merge branch 'irq/sparseirq' into cpus4096
X-Git-Tag: v2.6.29-rc1~538^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e;p=pandora-kernel.git

Merge branch 'irq/sparseirq' into cpus4096

Conflicts:
	arch/x86/kernel/io_apic.c

Merge irq/sparseirq here, to resolve conflicts.
---

948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e
Reading git-diff-tree failed