From: Linus Torvalds Date: Mon, 1 Oct 2012 18:06:35 +0000 (-0700) Subject: Merge branches 'x86-cpu-for-linus' and 'x86-cpufeature-for-linus' of git://git.kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a553e1450827acb1b4bcaa5a0ae079209d16038;p=linux-beck.git Merge branches 'x86-cpu-for-linus' and 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86/cpu and x86/cpufeature from Ingo Molnar: "One tiny cleanup, and prepare for SMAP (Supervisor Mode Access Prevention) support on x86" * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: Remove the useless branch in c_start() * 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, cpufeature: Add feature bit for SMAP --- 4a553e1450827acb1b4bcaa5a0ae079209d16038