From: Ingo Molnar Date: Thu, 2 Apr 2009 14:33:42 +0000 (+0200) Subject: Merge branch 'linus' into x86/urgent X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=83f2f0ed715eb15a8e13c07df479d65bbc10d8d5;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'linus' into x86/urgent Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic) and fix it. Signed-off-by: Ingo Molnar --- 83f2f0ed715eb15a8e13c07df479d65bbc10d8d5