From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 May 2010 19:20:09 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.0~5004
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef0e9180d3589ad35eefe9be6b239f32719fd548;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments
  x86, k8: Fix build error when K8_NB is disabled
  x86, amd: Check X86_FEATURE_OSVW bit before accessing OSVW MSRs
  x86: Fix fake apicid to node mapping for numa emulation
---

ef0e9180d3589ad35eefe9be6b239f32719fd548