From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Sep 2013 19:36:12 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.12-rc1~134
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=050ba07cdc9aaef17e1be251aa8fceb9a919d5d3;p=~andy%2Flinux

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "Fix for the annoying paravirt.o build warning under allmodconfig, and
  a MAINTAINERS file update"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, doc: Add an entry in MAINTAINERS for arch/x86/kernel/cpu/vmware.c
  x86, paravirt: Remove duplicate definition for DEF_NATIVE
---

050ba07cdc9aaef17e1be251aa8fceb9a919d5d3