From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 28 Mar 2009 22:05:50 +0000 (+0100)
Subject: Merge branch 'linus' into core/iommu
X-Git-Tag: v2.6.30-rc1~614^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0d44c0dbbd52effb731b1c0af9afd56215c48de;p=pandora-kernel.git

Merge branch 'linus' into core/iommu

Conflicts:
	arch/x86/Kconfig
---

b0d44c0dbbd52effb731b1c0af9afd56215c48de
Reading git-diff-tree failed