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: firefly_0821_release~17842^2~2^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8d7ccaa545490cdffdfaff0842436a8dd85cf47b;p=firefly-linux-kernel-4.4.55.git

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