From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Feb 2009 17:15:39 +0000 (-0800)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.29-rc6~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=460c1338fc05add0e8050d4945a46f207b13a5fc;p=users%2Fdwmw2%2Flinux.git

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/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, mce: remove incorrect __cpuinit for mce_cpu_features()
  MAINTAINERS: paravirt-ops maintainers update
---

460c1338fc05add0e8050d4945a46f207b13a5fc