From: Linus Torvalds Date: Thu, 21 Oct 2010 20:18:36 +0000 (-0700) Subject: Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v2.6.37-rc1~208 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf70030dc0b031f000c74721f2e9c88686b7da6d;p=pandora-kernel.git Merge branch 'x86-cpu-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, cpu: Fix X86_FEATURE_NOPL x86, cpu: Re-run get_cpu_cap() after adjusting the CPUID level --- bf70030dc0b031f000c74721f2e9c88686b7da6d Reading git-diff-tree failed