From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 17 Apr 2009 14:18:22 +0000 (+0200)
Subject: Merge branch 'linus' into x86/apic
X-Git-Tag: v2.6.31-rc1~423^2~23^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5043124e660fcc3ddefe4239ddfa017bf13f5081;p=pandora-kernel.git

Merge branch 'linus' into x86/apic

Merge reason: new intr-remap patches depend on the s2ram iommu fixes from upstream

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

5043124e660fcc3ddefe4239ddfa017bf13f5081
Reading git-diff-tree failed