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: fixes-v4.0-rc1~94^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0967160ad615985c7c35443156ea9aecc60c37b8;p=pandora-kernel.git Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches Signed-off-by: Ingo Molnar --- 0967160ad615985c7c35443156ea9aecc60c37b8