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-Tag: firefly_0821_release~176^2~1623^2~21 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cffc32975da7df2ef909299c47ff644e1357e0ac;p=firefly-linux-kernel-4.4.55.git Merge branch 'x86/asm' into x86/apic, to resolve conflicts Signed-off-by: Ingo Molnar --- cffc32975da7df2ef909299c47ff644e1357e0ac