From: Linus Torvalds Date: Tue, 14 Oct 2014 00:19:47 +0000 (+0200) Subject: Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: omap-for-v3.19/prcm-cleanup~88 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=708d0b41a26907ac83cde41dd5a75b5a2f8f1218;p=pandora-kernel.git Merge branch 'x86-cpufeature-for-linus' of git://git./linux/kernel/git/tip/tip Pull x86 cpufeature updates from Ingo Molnar: "This tree includes the following changes: - Introduce DISABLED_MASK to list disabled CPU features, to simplify CPU feature handling and avoid excessive #ifdefs - Remove the lightly used cpu_has_pae() primitive" * 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: Add more disabled features x86: Introduce disabled-features x86: Axe the lightly-used cpu_has_pae --- 708d0b41a26907ac83cde41dd5a75b5a2f8f1218 Reading git-diff-tree failed