From: H. Peter Anvin Date: Thu, 22 May 2014 00:36:33 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso X-Git-Tag: v3.16-rc1~47^2~13^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03c1b4e8e560455a2634a76998883a22f1a01207;p=platform%2Fkernel%2Flinux-exynos.git Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso Merge x86/espfix into x86/vdso, due to changes in the vdso setup code that otherwise cause conflicts. Signed-off-by: H. Peter Anvin --- 03c1b4e8e560455a2634a76998883a22f1a01207