From: Ingo Molnar Date: Sun, 17 May 2015 05:58:08 +0000 (+0200) Subject: Merge branch 'x86/asm' into x86/apic, to resolve conflicts X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cffc32975da7df2ef909299c47ff644e1357e0ac;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'x86/asm' into x86/apic, to resolve conflicts Signed-off-by: Ingo Molnar --- cffc32975da7df2ef909299c47ff644e1357e0ac