From: Ingo Molnar Date: Thu, 14 Aug 2008 10:19:59 +0000 (+0200) Subject: Merge commit 'v2.6.27-rc3' into x86/prototypes X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8d7ccaa545490cdffdfaff0842436a8dd85cf47b;p=openwrt%2Fstaging%2Fblogic.git Merge commit 'v2.6.27-rc3' into x86/prototypes Conflicts: include/asm-x86/dma-mapping.h Signed-off-by: Ingo Molnar --- 8d7ccaa545490cdffdfaff0842436a8dd85cf47b