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

1 files changed, 6 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 69d42b6ff28a..c9fedf12f144 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9075,6 +9075,12 @@ F:	drivers/staging/vme/
 F:      drivers/vme/
 F:      include/linux/vme*
 
+VMWARE HYPERVISOR INTERFACE
+M:      Alok Kataria <akataria@vmware.com>
+L:      virtualization@lists.linux-foundation.org
+S:      Supported
+F:      arch/x86/kernel/cpu/vmware.c
+
 VMWARE VMXNET3 ETHERNET DRIVER
 M:      Shreyas Bhatewara <sbhatewara@vmware.com>
 M:      "VMware, Inc." <pv-drivers@vmware.com>