Merge tag 'v3.16-rc5' into timers/core

Reason: Bring in upstream modifications, so the pending changes which
depend on them can be queued.

1 files changed, 155 insertions, 80 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 970c4a07a9ab..1d287ae529a1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -604,6 +604,13 @@ L:	amd64-microcode@amd64.org
 S:      Maintained
 F:      arch/x86/kernel/microcode_amd.c
 
+AMD XGBE DRIVER
+M:      Tom Lendacky <thomas.lendacky@amd.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+F:      drivers/net/ethernet/amd/xgbe/
+F:      drivers/net/phy/amd-xgbe-phy.c
+
 AMS (Apple Motion Sensor) DRIVER
 M:      Michael Hanselmann <linux-kernel@hansmi.ch>
 S:      Supported
@@ -936,16 +943,10 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 F:      arch/arm/mach-imx/
+F:      arch/arm/mach-mxs/
 F:      arch/arm/boot/dts/imx*
 F:      arch/arm/configs/imx*_defconfig
 
-ARM/FREESCALE MXS ARM ARCHITECTURE
-M:      Shawn Guo <shawn.guo@linaro.org>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-T:      git git://git.linaro.org/people/shawnguo/linux-2.6.git
-F:      arch/arm/mach-mxs/
-
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1045,9 +1046,33 @@ M:	Santosh Shilimkar <santosh.shilimkar@ti.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-keystone/
-F:      drivers/clk/keystone/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 
+ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/clk/keystone/
+
+ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/clocksource/timer-keystone.c
+
+ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/power/reset/keystone-reset.c
+
+ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/memory/*emif*
+
 ARM/LOGICPD PXA270 MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1289,6 +1314,20 @@ W:	http://oss.renesas.com
 Q:      http://patchwork.kernel.org/project/linux-sh/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:      Supported
+F:      arch/arm/boot/dts/emev2*
+F:      arch/arm/boot/dts/r7s*
+F:      arch/arm/boot/dts/r8a*
+F:      arch/arm/boot/dts/sh*
+F:      arch/arm/configs/ape6evm_defconfig
+F:      arch/arm/configs/armadillo800eva_defconfig
+F:      arch/arm/configs/bockw_defconfig
+F:      arch/arm/configs/genmai_defconfig
+F:      arch/arm/configs/koelsch_defconfig
+F:      arch/arm/configs/kzm9g_defconfig
+F:      arch/arm/configs/lager_defconfig
+F:      arch/arm/configs/mackerel_defconfig
+F:      arch/arm/configs/marzen_defconfig
+F:      arch/arm/configs/shmobile_defconfig
 F:      arch/arm/mach-shmobile/
 F:      drivers/sh/
 
@@ -1894,7 +1933,7 @@ F:	drivers/net/ethernet/broadcom/bnx2.*
 F:      drivers/net/ethernet/broadcom/bnx2_*
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
-M:      Ariel Elior <ariele@broadcom.com>
+M:      Ariel Elior <ariel.elior@qlogic.com>
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/broadcom/bnx2x/
@@ -1974,6 +2013,12 @@ S:	Maintained
 F:      drivers/bcma/
 F:      include/linux/bcma/
 
+BROADCOM SYSTEMPORT ETHERNET DRIVER
+M:      Florian Fainelli <f.fainelli@gmail.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+F:      drivers/net/ethernet/broadcom/bcmsysport.*
+
 BROCADE BFA FC SCSI DRIVER
 M:      Anil Gurumurthy <anil.gurumurthy@qlogic.com>
 M:      Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
@@ -2230,9 +2275,8 @@ F:	drivers/platform/chrome/
 CISCO VIC ETHERNET NIC DRIVER
 M:      Christian Benvenuti <benve@cisco.com>
 M:      Sujith Sankar <ssujith@cisco.com>
-M:      Govindarajulu Varadarajan <govindarajulu90@gmail.com>
+M:      Govindarajulu Varadarajan <_govind@gmx.com>
 M:      Neel Patel <neepatel@cisco.com>
-M:      Nishank Trivedi <nistrive@cisco.com>
 S:      Supported
 F:      drivers/net/ethernet/cisco/enic/
 
@@ -2384,16 +2428,35 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/connector/
 
-CONTROL GROUPS (CGROUPS)
+CONTROL GROUP (CGROUP)
 M:      Tejun Heo <tj@kernel.org>
 M:      Li Zefan <lizefan@huawei.com>
-L:      containers@lists.linux-foundation.org
 L:      cgroups@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:      Maintained
+F:      Documentation/cgroups/
 F:      include/linux/cgroup*
 F:      kernel/cgroup*
-F:      mm/*cgroup*
+
+CONTROL GROUP - CPUSET
+M:      Li Zefan <lizefan@huawei.com>
+L:      cgroups@vger.kernel.org
+W:      http://www.bullopensource.org/cpuset/
+W:      http://oss.sgi.com/projects/cpusets/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
+S:      Maintained
+F:      Documentation/cgroups/cpusets.txt
+F:      include/linux/cpuset.h
+F:      kernel/cpuset.c
+
+CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
+M:      Johannes Weiner <hannes@cmpxchg.org>
+M:      Michal Hocko <mhocko@suse.cz>
+L:      cgroups@vger.kernel.org
+L:      linux-mm@kvack.org
+S:      Maintained
+F:      mm/memcontrol.c
+F:      mm/page_cgroup.c
 
 CORETEMP HARDWARE MONITORING DRIVER
 M:      Fenghua Yu <fenghua.yu@intel.com>
@@ -2464,17 +2527,6 @@ M:	Thomas Renninger <trenn@suse.de>
 S:      Maintained
 F:      tools/power/cpupower/
 
-CPUSETS
-M:      Li Zefan <lizefan@huawei.com>
-L:      cgroups@vger.kernel.org
-W:      http://www.bullopensource.org/cpuset/
-W:      http://oss.sgi.com/projects/cpusets/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
-S:      Maintained
-F:      Documentation/cgroups/cpusets.txt
-F:      include/linux/cpuset.h
-F:      kernel/cpuset.c
-
 CRAMFS FILESYSTEM
 W:      http://sourceforge.net/projects/cramfs/
 S:      Orphan / Obsolete
@@ -2574,7 +2626,7 @@ S:	Supported
 F:      drivers/infiniband/hw/cxgb3/
 
 CXGB4 ETHERNET DRIVER (CXGB4)
-M:      Dimitris Michailidis <dm@chelsio.com>
+M:      Hariprasad S <hariprasad@chelsio.com>
 L:      netdev@vger.kernel.org
 W:      http://www.chelsio.com
 S:      Supported
@@ -2692,6 +2744,15 @@ S:	Orphan
 F:      Documentation/networking/decnet.txt
 F:      net/decnet/
 
+DECSTATION PLATFORM SUPPORT
+M:      "Maciej W. Rozycki" <macro@linux-mips.org>
+L:      linux-mips@linux-mips.org
+W:      http://www.linux-mips.org/wiki/DECstation
+S:      Maintained
+F:      arch/mips/dec/
+F:      arch/mips/include/asm/dec/
+F:      arch/mips/include/asm/mach-dec/
+
 DEFXX FDDI NETWORK DRIVER
 M:      "Maciej W. Rozycki" <macro@linux-mips.org>
 S:      Maintained
@@ -2888,6 +2949,9 @@ L:	linux-doc@vger.kernel.org
 T:      quilt http://www.infradead.org/~rdunlap/Doc/patches/
 S:      Maintained
 F:      Documentation/
+X:      Documentation/ABI/
+X:      Documentation/devicetree/
+X:      Documentation/[a-z][a-z]_[A-Z][A-Z]/
 
 DOUBLETALK DRIVER
 M:      "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@ -2935,6 +2999,7 @@ L:	dri-devel@lists.freedesktop.org
 T:      git git://people.freedesktop.org/~airlied/linux
 S:      Maintained
 F:      drivers/gpu/drm/
+F:      drivers/gpu/vga/
 F:      include/drm/
 F:      include/uapi/drm/
 
@@ -3159,14 +3224,6 @@ L:	linux-scsi@vger.kernel.org
 S:      Maintained
 F:      drivers/scsi/eata_pio.*
 
-EBTABLES
-L:      netfilter-devel@vger.kernel.org
-W:      http://ebtables.sourceforge.net/
-S:      Orphan
-F:      include/linux/netfilter_bridge/ebt_*.h
-F:      include/uapi/linux/netfilter_bridge/ebt_*.h
-F:      net/bridge/netfilter/ebt*.c
-
 EC100 MEDIA DRIVER
 M:      Antti Palosaari <crope@iki.fi>
 L:      linux-media@vger.kernel.org
@@ -3775,7 +3832,8 @@ F:	fs/fscache/
 F:      include/linux/fscache*.h
 
 F2FS FILE SYSTEM
-M:      Jaegeuk Kim <jaegeuk.kim@samsung.com>
+M:      Jaegeuk Kim <jaegeuk@kernel.org>
+M:      Changman Lee <cm224.lee@samsung.com>
 L:      linux-f2fs-devel@lists.sourceforge.net
 W:      http://en.wikipedia.org/wiki/F2FS
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
@@ -4373,7 +4431,7 @@ S:	Supported
 F:      drivers/crypto/nx/
 
 IBM Power 842 compression accelerator
-M:      Robert Jennings <rcj@linux.vnet.ibm.com>
+M:      Nathan Fontenot <nfont@linux.vnet.ibm.com>
 S:      Supported
 F:      drivers/crypto/nx/nx-842.c
 F:      include/linux/nx842.h
@@ -4389,12 +4447,18 @@ L:	netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/ibm/ibmveth.*
 
-IBM Power Virtual SCSI/FC Device Drivers
-M:      Robert Jennings <rcj@linux.vnet.ibm.com>
+IBM Power Virtual SCSI Device Drivers
+M:      Nathan Fontenot <nfont@linux.vnet.ibm.com>
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+F:      drivers/scsi/ibmvscsi/ibmvscsi*
+F:      drivers/scsi/ibmvscsi/viosrp.h
+
+IBM Power Virtual FC Device Drivers
+M:      Brian King <brking@linux.vnet.ibm.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
-F:      drivers/scsi/ibmvscsi/
-X:      drivers/scsi/ibmvscsi/ibmvstgt.c
+F:      drivers/scsi/ibmvscsi/ibmvfc*
 
 IBM ServeRAID RAID DRIVER
 P:      Jack Hammer
@@ -5480,10 +5544,11 @@ S:	Maintained
 F:      arch/arm/mach-lpc32xx/
 
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
-M:      Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
-M:      Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
-M:      support@lsi.com
-L:      DL-MPTFusionLinux@lsi.com
+M:      Nagalakshmi Nandigama <nagalakshmi.nandigama@avagotech.com>
+M:      Praveen Krishnamoorthy <praveen.krishnamoorthy@avagotech.com>
+M:      Sreekanth Reddy <sreekanth.reddy@avagotech.com>
+M:      Abhijit Mahajan <abhijit.mahajan@avagotech.com>
+L:      MPT-FusionLinux.pdl@avagotech.com
 L:      linux-scsi@vger.kernel.org
 W:      http://www.lsilogic.com/support
 S:      Supported
@@ -5757,17 +5822,6 @@ F:	include/linux/memory_hotplug.h
 F:      include/linux/vmalloc.h
 F:      mm/
 
-MEMORY RESOURCE CONTROLLER
-M:      Johannes Weiner <hannes@cmpxchg.org>
-M:      Michal Hocko <mhocko@suse.cz>
-M:      Balbir Singh <bsingharora@gmail.com>
-M:      KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
-L:      cgroups@vger.kernel.org
-L:      linux-mm@kvack.org
-S:      Maintained
-F:      mm/memcontrol.c
-F:      mm/page_cgroup.c
-
 MEMORY TECHNOLOGY DEVICES (MTD)
 M:      David Woodhouse <dwmw2@infradead.org>
 M:      Brian Norris <computersforpeace@gmail.com>
@@ -5961,6 +6015,7 @@ M:	Chris Ball <chris@printf.net>
 M:      Ulf Hansson <ulf.hansson@linaro.org>
 L:      linux-mmc@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
+T:      git git://git.linaro.org/people/ulf.hansson/mmc.git
 S:      Maintained
 F:      drivers/mmc/
 F:      include/linux/mmc/
@@ -6022,6 +6077,28 @@ M:	Petr Vandrovec <petr@vandrovec.name>
 S:      Odd Fixes
 F:      fs/ncpfs/
 
+NCR 5380 SCSI DRIVERS
+M:      Finn Thain <fthain@telegraphics.com.au>
+M:      Michael Schmitz <schmitzmic@gmail.com>
+L:      linux-scsi@vger.kernel.org
+S:      Maintained
+F:      Documentation/scsi/g_NCR5380.txt
+F:      drivers/scsi/NCR5380.*
+F:      drivers/scsi/arm/cumana_1.c
+F:      drivers/scsi/arm/oak.c
+F:      drivers/scsi/atari_NCR5380.c
+F:      drivers/scsi/atari_scsi.*
+F:      drivers/scsi/dmx3191d.c
+F:      drivers/scsi/dtc.*
+F:      drivers/scsi/g_NCR5380.*
+F:      drivers/scsi/g_NCR5380_mmio.c
+F:      drivers/scsi/mac_scsi.*
+F:      drivers/scsi/pas16.*
+F:      drivers/scsi/sun3_NCR5380.c
+F:      drivers/scsi/sun3_scsi.*
+F:      drivers/scsi/sun3_scsi_vme.c
+F:      drivers/scsi/t128.*
+
 NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
 M:      "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 L:      linux-scsi@vger.kernel.org
@@ -6056,12 +6133,11 @@ F:	Documentation/networking/s2io.txt
 F:      Documentation/networking/vxge.txt
 F:      drivers/net/ethernet/neterion/
 
-NETFILTER/IPTABLES
+NETFILTER ({IP,IP6,ARP,EB,NF}TABLES)
 M:      Pablo Neira Ayuso <pablo@netfilter.org>
 M:      Patrick McHardy <kaber@trash.net>
 M:      Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 L:      netfilter-devel@vger.kernel.org
-L:      netfilter@vger.kernel.org
 L:      coreteam@netfilter.org
 W:      http://www.netfilter.org/
 W:      http://www.iptables.org/
@@ -6131,6 +6207,7 @@ F:	include/uapi/linux/netdevice.h
 F:      tools/net/
 F:      tools/testing/selftests/net/
 F:      lib/random32.c
+F:      lib/test_bpf.c
 
 NETWORKING [IPv4/IPv6]
 M:      "David S. Miller" <davem@davemloft.net>
@@ -6724,7 +6801,7 @@ F:	arch/x86/kernel/quirks.c
 
 PCI DRIVER FOR IMX6
 M:      Richard Zhu <r65037@freescale.com>
-M:      Shawn Guo <shawn.guo@linaro.org>
+M:      Shawn Guo <shawn.guo@freescale.com>
 L:      linux-pci@vger.kernel.org
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
@@ -6910,7 +6987,7 @@ PKUNITY SOC DRIVERS
 M:      Guan Xuetao <gxt@mprc.pku.edu.cn>
 W:      http://mprc.pku.edu.cn/~guanxuetao/linux
 S:      Maintained
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+T:      git git://github.com/gxt/linux.git
 F:      drivers/input/serio/i8042-unicore32io.h
 F:      drivers/i2c/busses/i2c-puv3.c
 F:      drivers/video/fb-puv3.c
@@ -7898,6 +7975,7 @@ F:	drivers/mmc/host/sdhci-spear.c
 
 SECURITY SUBSYSTEM
 M:      James Morris <james.l.morris@oracle.com>
+M:      Serge E. Hallyn <serge@hallyn.com>
 L:      linux-security-module@vger.kernel.org (suggested Cc:)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
 W:      http://kernsec.org/
@@ -8145,13 +8223,15 @@ S:	Maintained
 F:      drivers/usb/misc/sisusbvga/
 
 SLAB ALLOCATOR
-M:      Christoph Lameter <cl@linux-foundation.org>
+M:      Christoph Lameter <cl@linux.com>
 M:      Pekka Enberg <penberg@kernel.org>
-M:      Matt Mackall <mpm@selenic.com>
+M:      David Rientjes <rientjes@google.com>
+M:      Joonsoo Kim <iamjoonsoo.kim@lge.com>
+M:      Andrew Morton <akpm@linux-foundation.org>
 L:      linux-mm@kvack.org
 S:      Maintained
 F:      include/linux/sl?b*.h
-F:      mm/sl?b.c
+F:      mm/sl?b*
 
 SLEEPABLE READ-COPY UPDATE (SRCU)
 M:      Lai Jiangshan <laijs@cn.fujitsu.com>
@@ -8918,7 +8998,7 @@ F:	drivers/media/radio/radio-raremono.c
 
 THERMAL
 M:      Zhang Rui <rui.zhang@intel.com>
-M:      Eduardo Valentin <eduardo.valentin@ti.com>
+M:      Eduardo Valentin <edubezval@gmail.com>
 L:      linux-pm@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
@@ -8945,7 +9025,7 @@ S:	Maintained
 F:      drivers/platform/x86/thinkpad_acpi.c
 
 TI BANDGAP AND THERMAL DRIVER
-M:      Eduardo Valentin <eduardo.valentin@ti.com>
+M:      Eduardo Valentin <edubezval@gmail.com>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      drivers/thermal/ti-soc-thermal/
@@ -9068,7 +9148,7 @@ F:	include/linux/toshiba.h
 F:      include/uapi/linux/toshiba.h
 
 TMIO MMC DRIVER
-M:      Ian Molton <ian@mnementh.co.uk>
+M:      Ian Molton <ian.molton@codethink.co.uk>
 L:      linux-mmc@vger.kernel.org
 S:      Maintained
 F:      drivers/mmc/host/tmio_mmc*
@@ -9109,7 +9189,6 @@ F:	drivers/char/tpm/
 
 TRACING
 M:      Steven Rostedt <rostedt@goodmis.org>
-M:      Frederic Weisbecker <fweisbec@gmail.com>
 M:      Ingo Molnar <mingo@redhat.com>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:      Maintained
@@ -9227,7 +9306,7 @@ UNICORE32 ARCHITECTURE:
 M:      Guan Xuetao <gxt@mprc.pku.edu.cn>
 W:      http://mprc.pku.edu.cn/~guanxuetao/linux
 S:      Maintained
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+T:      git git://github.com/gxt/linux.git
 F:      arch/unicore32/
 
 UNIFDEF
@@ -9360,12 +9439,6 @@ S:	Maintained
 F:      drivers/usb/host/isp116x*
 F:      include/linux/usb/isp116x.h
 
-USB KAWASAKI LSI DRIVER
-M:      Oliver Neukum <oliver@neukum.org>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/kl5kusb105.*
-
 USB MASS STORAGE DRIVER
 M:      Matthew Dharm <mdharm-usb@one-eyed-alien.net>
 L:      linux-usb@vger.kernel.org
@@ -9393,12 +9466,6 @@ S:	Maintained
 F:      Documentation/usb/ohci.txt
 F:      drivers/usb/host/ohci*
 
-USB OPTION-CARD DRIVER
-M:      Matthias Urlichs <smurf@smurf.noris.de>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/option.c
-
 USB PEGASUS DRIVER
 M:      Petko Manolov <petkan@nucleusys.com>
 L:      linux-usb@vger.kernel.org
@@ -9431,7 +9498,7 @@ S:	Maintained
 F:      drivers/net/usb/rtl8150.c
 
 USB SERIAL SUBSYSTEM
-M:      Johan Hovold <jhovold@gmail.com>
+M:      Johan Hovold <johan@kernel.org>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 F:      Documentation/usb/usb-serial.txt
@@ -9694,6 +9761,14 @@ L:	virtualization@lists.linux-foundation.org
 S:      Supported
 F:      arch/x86/kernel/cpu/vmware.c
 
+VMWARE BALLOON DRIVER
+M:      Xavier Deguillard <xdeguillard@vmware.com>
+M:      Philip Moltmann <moltmann@vmware.com>
+M:      "VMware, Inc." <pv-drivers@vmware.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/misc/vmw_balloon.c
+
 VMWARE VMXNET3 ETHERNET DRIVER
 M:      Shreyas Bhatewara <sbhatewara@vmware.com>
 M:      "VMware, Inc." <pv-drivers@vmware.com>