From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 14 Aug 2008 10:19:59 +0000 (+0200)
Subject: Merge commit 'v2.6.27-rc3' into x86/prototypes
X-Git-Tag: v2.6.28-rc1~734^2~2^2
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/8d7ccaa545490cdffdfaff0842436a8dd85cf47b

Merge commit 'v2.6.27-rc3' into x86/prototypes

Conflicts:

	include/asm-x86/dma-mapping.h

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

8d7ccaa545490cdffdfaff0842436a8dd85cf47b