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

Merge branch 'linus' into core/iommu

Conflicts:
	arch/ia64/include/asm/dma-mapping.h
	arch/ia64/include/asm/machvec.h
	arch/ia64/include/asm/machvec_sn2.h
---

af2519fb2298cdf7540082c36f4d8c66bbff103f
Reading git-diff-tree failed