From: Ingo Molnar Date: Wed, 4 Feb 2015 08:01:12 +0000 (+0100) Subject: Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches X-Git-Tag: firefly_0821_release~176^2~1816^2~106 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0967160ad615985c7c35443156ea9aecc60c37b8;p=firefly-linux-kernel-4.4.55.git Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches Signed-off-by: Ingo Molnar --- 0967160ad615985c7c35443156ea9aecc60c37b8