tree 5dfbf43f2b777db060409085cdecc4c0087586da
parent 710320d57999016729da7c9cfee017b276f553bc
parent cc3ca22063784076bd240fda87217387a8f2ae92
author Linus Torvalds <torvalds@linux-foundation.org> 1235236539 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235236539 -0800

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