From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 28 Jul 2008 22:07:55 +0000 (+0200)
Subject: Merge branch 'linus' into core/generic-dma-coherent
X-Git-Tag: v2.6.27-rc1~3^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb28a1bbdb4790378e7366d6c9ee1d2340b84f92;p=pandora-kernel.git

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	arch/x86/Kconfig

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

cb28a1bbdb4790378e7366d6c9ee1d2340b84f92
Reading git-diff-tree failed