Merge tag 'for-3.11-rc1' of git://gitorious.org/linux-pwm/linux-pwm
[pandora-kernel.git] / MAINTAINERS
index 3200369..37f9a71 100644 (file)
@@ -180,6 +180,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
 S:     Maintained
 F:     Documentation/filesystems/9p.txt
 F:     fs/9p/
+F:     net/9p/
+F:     include/net/9p/
+F:     include/uapi/linux/virtio_9p.h
+F:     include/trace/events/9p.h
+
 
 A8293 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
@@ -242,6 +247,11 @@ F: drivers/acpi/
 F:     drivers/pnp/pnpacpi/
 F:     include/linux/acpi.h
 F:     include/acpi/
+F:     Documentation/acpi
+F:     Documentation/ABI/testing/sysfs-bus-acpi
+F:     drivers/pci/*acpi*
+F:     drivers/pci/*/*acpi*
+F:     drivers/pci/*/*/*acpi*
 
 ACPI FAN DRIVER
 M:     Zhang Rui <rui.zhang@intel.com>
@@ -742,7 +752,7 @@ S:  Maintained
 F:     arch/arm/mach-highbank/
 
 ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
-M:     Anton Vorontsov <avorontsov@mvista.com>
+M:     Anton Vorontsov <anton@enomsg.org>
 S:     Maintained
 F:     arch/arm/mach-cns3xxx/
 T:     git git://git.infradead.org/users/cbou/linux-cns3xxx.git
@@ -797,6 +807,7 @@ F:  arch/arm/mach-gemini/
 ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
 M:     Barry Song <baohua.song@csr.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
 S:     Maintained
 F:     arch/arm/mach-prima2/
 F:     drivers/dma/sirf-dma.c
@@ -1135,6 +1146,7 @@ L:        linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-s5p*/
 F:     arch/arm/mach-exynos*/
+N:     exynos
 
 ARM/SAMSUNG MOBILE MACHINE SUPPORT
 M:     Kyungmin Park <kyungmin.park@samsung.com>
@@ -1201,6 +1213,15 @@ M:       Dinh Nguyen <dinguyen@altera.com>
 S:     Maintained
 F:     drivers/clk/socfpga/
 
+ARM/STI ARCHITECTURE
+M:     Srinivas Kandagatla <srinivas.kandagatla@st.com>
+M:     Stuart Menefy <stuart.menefy@st.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     kernel@stlinux.com
+W:     http://www.stlinux.com
+S:     Maintained
+F:     arch/arm/mach-sti/
+
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1285,6 +1306,7 @@ S:        Maintained
 F:     arch/arm/mach-vt8500/
 F:     drivers/clocksource/vt8500_timer.c
 F:     drivers/gpio/gpio-vt8500.c
+F:     drivers/i2c/busses/i2c-wmt.c
 F:     drivers/mmc/host/wmt-sdmmc.c
 F:     drivers/pwm/pwm-vt8500.c
 F:     drivers/rtc/rtc-vt8500.c
@@ -1309,6 +1331,7 @@ W:        http://wiki.xilinx.com
 T:     git git://git.xilinx.com/linux-xlnx.git
 S:     Supported
 F:     arch/arm/mach-zynq/
+F:     drivers/cpuidle/cpuidle-zynq.c
 
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:     Catalin Marinas <catalin.marinas@arm.com>
@@ -1600,6 +1623,7 @@ F:        drivers/net/wireless/b43legacy/
 
 BACKLIGHT CLASS/SUBSYSTEM
 M:     Richard Purdie <rpurdie@rpsys.net>
+M:     Jingoo Han <jg1.han@samsung.com>
 S:     Maintained
 F:     drivers/video/backlight/
 F:     include/linux/backlight.h
@@ -1858,6 +1882,13 @@ S:       Odd fixes
 F:     Documentation/video4linux/bttv/
 F:     drivers/media/pci/bt8xx/bttv*
 
+BUSLOGIC SCSI DRIVER
+M:     Khalid Aziz <khalid@gonehiking.org>
+L:     linux-scsi@vger.kernel.org
+S:     Maintained
+F:     drivers/scsi/BusLogic.*
+F:     drivers/scsi/FlashPoint.*
+
 C-MEDIA CMI8788 DRIVER
 M:     Clemens Ladisch <clemens@ladisch.de>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -2120,9 +2151,10 @@ M:       Mike Turquette <mturquette@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (same as CLK API & CLKDEV)
 T:     git git://git.linaro.org/people/mturquette/linux.git
 S:     Maintained
-F:     drivers/clk/clk.c
-F:     drivers/clk/clk-*
+F:     drivers/clk/
+X:     drivers/clk/clkdev.c
 F:     include/linux/clk-pr*
+F:     include/linux/clk/
 
 COMMON INTERNET FILE SYSTEM (CIFS)
 M:     Steve French <sfrench@samba.org>
@@ -2215,7 +2247,8 @@ M:        Viresh Kumar <viresh.kumar@linaro.org>
 L:     cpufreq@vger.kernel.org
 L:     linux-pm@vger.kernel.org
 S:     Maintained
-T:     git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
+T:     git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
 F:     drivers/cpufreq/
 F:     include/linux/cpufreq.h
 
@@ -2299,6 +2332,11 @@ M:       Jaya Kumar <jayakumar.alsa@gmail.com>
 S:     Maintained
 F:     sound/pci/cs5535audio/
 
+CW1200 WLAN driver
+M:     Solomon Peachy <pizza@shaftnet.org>
+S:     Maintained
+F:     drivers/net/wireless/cw1200/
+
 CX18 VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
 L:     ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
@@ -2516,7 +2554,7 @@ F:        drivers/usb/dwc3/
 DEVICE FREQUENCY (DEVFREQ)
 M:     MyungJoo Ham <myungjoo.ham@samsung.com>
 M:     Kyungmin Park <kyungmin.park@samsung.com>
-L:     linux-kernel@vger.kernel.org
+L:     linux-pm@vger.kernel.org
 S:     Maintained
 F:     drivers/devfreq/
 
@@ -2697,12 +2735,14 @@ F:      include/drm/exynos*
 F:     include/uapi/drm/exynos*
 
 DRM DRIVERS FOR NVIDIA TEGRA
-M:     Thierry Reding <thierry.reding@avionic-design.de>
+M:     Thierry Reding <thierry.reding@gmail.com>
+M:     Terje Bergström <tbergstrom@nvidia.com>
 L:     dri-devel@lists.freedesktop.org
 L:     linux-tegra@vger.kernel.org
-T:     git git://gitorious.org/thierryreding/linux.git
+T:     git git://anongit.freedesktop.org/tegra/linux.git
 S:     Maintained
-F:     drivers/gpu/drm/tegra/
+F:     drivers/gpu/host1x/
+F:     include/uapi/drm/tegra_drm.h
 F:     Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
 
 DSBR100 USB FM RADIO DRIVER
@@ -2890,8 +2930,8 @@ F:        drivers/media/dvb-frontends/ec100*
 
 ECRYPT FILE SYSTEM
 M:     Tyler Hicks <tyhicks@canonical.com>
-M:     Dustin Kirkland <dustin.kirkland@gazzang.com>
 L:     ecryptfs@vger.kernel.org
+W:     http://ecryptfs.org
 W:     https://launchpad.net/ecryptfs
 S:     Supported
 F:     Documentation/filesystems/ecryptfs.txt
@@ -3103,6 +3143,13 @@ M:       Maxim Levitsky <maximlevitsky@gmail.com>
 S:     Maintained
 F:     drivers/media/rc/ene_ir.*
 
+ENHANCED ERROR HANDLING (EEH)
+M:     Gavin Shan <shangw@linux.vnet.ibm.com>
+L:     linuxppc-dev@lists.ozlabs.org
+S:     Supported
+F:     Documentation/powerpc/eeh-pci-error-recovery.txt
+F:     arch/powerpc/kernel/eeh*.c
+
 EPSON S1D13XXX FRAMEBUFFER DRIVER
 M:     Kristoffer Ericson <kristoffer.ericson@gmail.com>
 S:     Maintained
@@ -3220,7 +3267,7 @@ F:        lib/fault-inject.c
 
 FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
 M:     Robert Love <robert.w.love@intel.com>
-L:     devel@open-fcoe.org
+L:     fcoe-devel@open-fcoe.org
 W:     www.Open-FCoE.org
 S:     Supported
 F:     drivers/scsi/libfc/
@@ -3309,6 +3356,15 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
 S:     Odd fixes
 F:     drivers/block/floppy.c
 
+FMC SUBSYSTEM
+M:     Alessandro Rubini <rubini@gnudd.com>
+W:     http://www.ohwr.org/projects/fmc-bus
+S:     Supported
+F:     drivers/fmc/
+F:     include/linux/fmc*.h
+F:     include/linux/ipmi-fru.h
+K:     fmc_d.*register
+
 FPU EMULATOR
 M:     Bill Metzenthen <billm@melbpc.org.au>
 W:     http://floatingpoint.sourceforge.net/emulator/index.html
@@ -3322,11 +3378,12 @@ F:      drivers/net/wan/dlci.c
 F:     drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
-M:     Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
+M:     Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
+M:     Tomi Valkeinen <tomi.valkeinen@ti.com>
 L:     linux-fbdev@vger.kernel.org
 W:     http://linux-fbdev.sourceforge.net/
 Q:     http://patchwork.kernel.org/project/linux-fbdev/list/
-T:     git git://github.com/schandinat/linux-2.6.git fbdev-next
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git
 S:     Maintained
 F:     Documentation/fb/
 F:     Documentation/devicetree/bindings/fb/
@@ -3566,6 +3623,7 @@ GPIO SUBSYSTEM
 M:     Grant Likely <grant.likely@linaro.org>
 M:     Linus Walleij <linus.walleij@linaro.org>
 S:     Maintained
+L:     linux-gpio@vger.kernel.org
 T:     git git://git.secretlab.ca/git/linux-2.6.git
 F:     Documentation/gpio.txt
 F:     drivers/gpio/
@@ -3865,9 +3923,16 @@ M:       K. Y. Srinivasan <kys@microsoft.com>
 M:     Haiyang Zhang <haiyangz@microsoft.com>
 L:     devel@linuxdriverproject.org
 S:     Maintained
-F:     drivers/hv/
+F:     arch/x86/include/asm/mshyperv.h
+F:     arch/x86/include/uapi/asm/hyperv.h
+F:     arch/x86/kernel/cpu/mshyperv.c
 F:     drivers/hid/hid-hyperv.c
+F:     drivers/hv/
 F:     drivers/net/hyperv/
+F:     drivers/scsi/storvsc_drv.c
+F:     drivers/video/hyperv_fb.c
+F:     include/linux/hyperv.h
+F:     tools/hv/
 
 I2C OVER PARALLEL PORT
 M:     Jean Delvare <khali@linux-fr.org>
@@ -3971,7 +4036,8 @@ S:        Maintained
 F:     arch/ia64/
 
 IBM Power in-Nest Crypto Acceleration
-M:     Kent Yoder <key@linux.vnet.ibm.com>
+M:     Marcelo Henrique Cerri <mhcerri@linux.vnet.ibm.com>
+M:     Fionnuala Gunter <fin@linux.vnet.ibm.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
 F:     drivers/crypto/nx/
@@ -4100,6 +4166,7 @@ F:        drivers/ipack/
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 M:     Mimi Zohar <zohar@us.ibm.com>
+M:     Dmitry Kasatkin <d.kasatkin@samsung.com>
 S:     Supported
 F:     security/integrity/ima/
 
@@ -4440,6 +4507,16 @@ S:       Maintained
 F:     drivers/scsi/*iscsi*
 F:     include/scsi/*iscsi*
 
+ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
+M:     Or Gerlitz <ogerlitz@mellanox.com>
+M:     Roi Dayan <roid@mellanox.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+W:     http://www.openfabrics.org
+W:     www.open-iscsi.org
+Q:     http://patchwork.kernel.org/project/linux-rdma/list/
+F:     drivers/infiniband/ulp/iser
+
 ISDN SUBSYSTEM
 M:     Karsten Keil <isdn@linux-pingi.de>
 L:     isdn4linux@listserv.isdn4linux.de (subscribers-only)
@@ -4559,7 +4636,7 @@ F:        fs/jbd2/
 F:     include/linux/jbd2.h
 
 JSM Neo PCI based serial card
-M:     Lucas Tavares <lucaskt@linux.vnet.ibm.com>
+M:     Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
 L:     linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/jsm/
@@ -4641,12 +4718,13 @@ F:      include/linux/sunrpc/
 F:     include/uapi/linux/sunrpc/
 
 KERNEL VIRTUAL MACHINE (KVM)
-M:     Marcelo Tosatti <mtosatti@redhat.com>
 M:     Gleb Natapov <gleb@redhat.com>
+M:     Paolo Bonzini <pbonzini@redhat.com>
 L:     kvm@vger.kernel.org
-W:     http://kvm.qumranet.com
+W:     http://linux-kvm.org
 S:     Supported
-F:     Documentation/*/kvm.txt
+F:     Documentation/*/kvm*.txt
+F:     Documentation/virtual/kvm/
 F:     arch/*/kvm/
 F:     arch/*/include/asm/kvm*
 F:     include/linux/kvm*
@@ -4692,14 +4770,23 @@ F:      arch/s390/kvm/
 F:     drivers/s390/kvm/
 
 KERNEL VIRTUAL MACHINE (KVM) FOR ARM
-M:     Christoffer Dall <cdall@cs.columbia.edu>
+M:     Christoffer Dall <christoffer.dall@linaro.org>
 L:     kvmarm@lists.cs.columbia.edu
 W:     http://systems.cs.columbia.edu/projects/kvm-arm
-S:     Maintained
+S:     Supported
 F:     arch/arm/include/uapi/asm/kvm*
 F:     arch/arm/include/asm/kvm*
 F:     arch/arm/kvm/
 
+KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
+M:     Marc Zyngier <marc.zyngier@arm.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     kvmarm@lists.cs.columbia.edu
+S:     Maintained
+F:     arch/arm64/include/uapi/asm/kvm*
+F:     arch/arm64/include/asm/kvm*
+F:     arch/arm64/kvm/
+
 KEXEC
 M:     Eric Biederman <ebiederm@xmission.com>
 W:     http://kernel.org/pub/linux/utils/kernel/kexec/
@@ -5413,9 +5500,12 @@ F:       include/media/mt9v032.h
 
 MULTIFUNCTION DEVICES (MFD)
 M:     Samuel Ortiz <sameo@linux.intel.com>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
+M:     Lee Jones <lee.jones@linaro.org>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git
 S:     Supported
 F:     drivers/mfd/
+F:     include/linux/mfd/
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 M:     Chris Ball <cjb@laptop.org>
@@ -5516,18 +5606,18 @@ F:      Documentation/networking/s2io.txt
 F:     Documentation/networking/vxge.txt
 F:     drivers/net/ethernet/neterion/
 
-NETFILTER/IPTABLES/IPCHAINS
-P:     Harald Welte
-P:     Jozsef Kadlecsik
+NETFILTER/IPTABLES
 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/
-T:     git git://1984.lsi.us.es/nf
-T:     git git://1984.lsi.us.es/nf-next
+Q:     http://patchwork.ozlabs.org/project/netfilter-devel/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
 S:     Supported
 F:     include/linux/netfilter*
 F:     include/linux/netfilter/
@@ -5747,7 +5837,7 @@ M:        Matthew Wilcox <willy@linux.intel.com>
 L:     linux-nvme@lists.infradead.org
 T:     git git://git.infradead.org/users/willy/linux-nvme.git
 S:     Supported
-F:     drivers/block/nvme.c
+F:     drivers/block/nvme*
 F:     include/linux/nvme.h
 
 OMAP SUPPORT
@@ -5915,8 +6005,10 @@ M:       Willem Riede <osst@riede.org>
 L:     osst-users@lists.sourceforge.net
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
-F:     drivers/scsi/osst*
-F:     drivers/scsi/st*
+F:     Documentation/scsi/osst.txt
+F:     drivers/scsi/osst.*
+F:     drivers/scsi/osst_*.h
+F:     drivers/scsi/st.h
 
 OPENCORES I2C BUS DRIVER
 M:     Peter Korsgaard <jacmet@sunsite.dk>
@@ -6076,9 +6168,18 @@ L:       linux-parisc@vger.kernel.org
 W:     http://www.parisc-linux.org/
 Q:     http://patchwork.kernel.org/project/linux-parisc/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
 S:     Maintained
 F:     arch/parisc/
+F:     Documentation/parisc/
 F:     drivers/parisc/
+F:     drivers/char/agp/parisc-agp.c
+F:     drivers/input/serio/gscps2.c
+F:     drivers/parport/parport_gsc.*
+F:     drivers/tty/serial/8250/8250_gsc.c
+F:     drivers/video/sti*
+F:     drivers/video/console/sti*
+F:     drivers/video/logo/logo_parisc*
 
 PC87360 HARDWARE MONITORING DRIVER
 M:     Jim Cromie <jim.cromie@gmail.com>
@@ -6121,7 +6222,6 @@ M:        Linas Vepstas <linasvepstas@gmail.com>
 L:     linux-pci@vger.kernel.org
 S:     Supported
 F:     Documentation/PCI/pci-error-recovery.txt
-F:     Documentation/powerpc/eeh-pci-error-recovery.txt
 
 PCI SUBSYSTEM
 M:     Bjorn Helgaas <bhelgaas@google.com>
@@ -6237,6 +6337,16 @@ L:       linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/pinctrl/pinctrl-at91.c
 
+PIN CONTROLLER - SAMSUNG
+M:     Tomasz Figa <t.figa@samsung.com>
+M:     Thomas Abraham <thomas.abraham@linaro.org>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/pinctrl/pinctrl-exynos.*
+F:     drivers/pinctrl/pinctrl-s3c*
+F:     drivers/pinctrl/pinctrl-samsung.*
+
 PIN CONTROLLER - ST SPEAR
 M:     Viresh Kumar <viresh.linux@gmail.com>
 L:     spear-devel@list.st.com
@@ -6296,7 +6406,7 @@ F:        include/linux/timer*
 F:     kernel/*timer*
 
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
-M:     Anton Vorontsov <cbou@mail.ru>
+M:     Anton Vorontsov <anton@enomsg.org>
 M:     David Woodhouse <dwmw2@infradead.org>
 T:     git git://git.infradead.org/battery-2.6.git
 S:     Maintained
@@ -6406,7 +6516,7 @@ S:        Maintained
 F:     drivers/block/ps3vram.c
 
 PSTORE FILESYSTEM
-M:     Anton Vorontsov <cbouatmailru@gmail.com>
+M:     Anton Vorontsov <anton@enomsg.org>
 M:     Colin Cross <ccross@android.com>
 M:     Kees Cook <keescook@chromium.org>
 M:     Tony Luck <tony.luck@intel.com>
@@ -6962,8 +7072,7 @@ SYNOPSYS DESIGNWARE DMAC DRIVER
 M:     Viresh Kumar <viresh.linux@gmail.com>
 S:     Maintained
 F:     include/linux/dw_dmac.h
-F:     drivers/dma/dw_dmac_regs.h
-F:     drivers/dma/dw_dmac.c
+F:     drivers/dma/dw/
 
 SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
 M:     Seungwon Jeon <tgih.jun@samsung.com>
@@ -7055,7 +7164,8 @@ M:        Kai Mäkisara <Kai.Makisara@kolumbus.fi>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
 F:     Documentation/scsi/st.txt
-F:     drivers/scsi/st*
+F:     drivers/scsi/st.*
+F:     drivers/scsi/st_*.h
 
 SCTP PROTOCOL
 M:     Vlad Yasevich <vyasevich@gmail.com>
@@ -7104,7 +7214,7 @@ F:        drivers/mmc/host/sdhci.*
 F:     drivers/mmc/host/sdhci-pltfm.[ch]
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
-M:     Anton Vorontsov <avorontsov@ru.mvista.com>
+M:     Anton Vorontsov <anton@enomsg.org>
 L:     linuxppc-dev@lists.ozlabs.org
 L:     linux-mmc@vger.kernel.org
 S:     Maintained
@@ -7596,7 +7706,7 @@ F:        drivers/clk/spear/
 SPI SUBSYSTEM
 M:     Mark Brown <broonie@kernel.org>
 M:     Grant Likely <grant.likely@linaro.org>
-L:     spi-devel-general@lists.sourceforge.net
+L:     linux-spi@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
 Q:     http://patchwork.kernel.org/project/spi-devel-general/list/
 S:     Maintained
@@ -7639,6 +7749,7 @@ STABLE BRANCH
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     stable@vger.kernel.org
 S:     Supported
+F:     Documentation/stable_kernel_rules.txt
 
 STAGING SUBSYSTEM
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -7755,7 +7866,7 @@ F:        drivers/staging/media/solo6x10/
 STAGING - SPEAKUP CONSOLE SPEECH DRIVER
 M:     William Hubbs <w.d.hubbs@gmail.com>
 M:     Chris Brannon <chris@the-brannons.com>
-M:     Kirk Reiser <kirk@braille.uwo.ca>
+M:     Kirk Reiser <kirk@reisers.ca>
 M:     Samuel Thibault <samuel.thibault@ens-lyon.org>
 L:     speakup@braille.uwo.ca
 W:     http://www.linux-speakup.org/
@@ -8212,7 +8323,8 @@ S:        Odd fixes
 F:     drivers/media/usb/tm6000/
 
 TPM DEVICE DRIVER
-M:     Kent Yoder <key@linux.vnet.ibm.com>
+M:     Leonidas Da Silva Barbosa <leosilva@linux.vnet.ibm.com>
+M:     Ashley Lai <ashley@ashleylai.com>
 M:     Rajiv Andrade <mail@srajiv.net>
 W:     http://tpmdd.sourceforge.net
 M:     Marcel Selhorst <tpmdd@selhorst.net>
@@ -8867,7 +8979,7 @@ M:        Liam Girdwood <lgirdwood@gmail.com>
 M:     Mark Brown <broonie@kernel.org>
 W:     http://opensource.wolfsonmicro.com/node/15
 W:     http://www.slimlogic.co.uk/?p=48
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
 S:     Supported
 F:     drivers/regulator/
 F:     include/linux/regulator/
@@ -8976,7 +9088,7 @@ S:        Maintained
 F:     drivers/net/wireless/wl3501*
 
 WM97XX TOUCHSCREEN DRIVERS
-M:     Mark Brown <broonie@opensource.wolfsonmicro.com>
+M:     Mark Brown <broonie@kernel.org>
 M:     Liam Girdwood <lrg@slimlogic.co.uk>
 L:     linux-input@vger.kernel.org
 T:     git git://opensource.wolfsonmicro.com/linux-2.6-touch
@@ -8986,7 +9098,6 @@ F:        drivers/input/touchscreen/*wm97*
 F:     include/linux/wm97xx.h
 
 WOLFSON MICROELECTRONICS DRIVERS
-M:     Mark Brown <broonie@opensource.wolfsonmicro.com>
 L:     patches@opensource.wolfsonmicro.com
 T:     git git://opensource.wolfsonmicro.com/linux-2.6-asoc
 T:     git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
@@ -9087,6 +9198,13 @@ S:       Supported
 F:     arch/arm/xen/
 F:     arch/arm/include/asm/xen/
 
+XEN HYPERVISOR ARM64
+M:     Stefano Stabellini <stefano.stabellini@eu.citrix.com>
+L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
+S:     Supported
+F:     arch/arm64/xen/
+F:     arch/arm64/include/asm/xen/
+
 XEN NETWORK BACKEND DRIVER
 M:     Ian Campbell <ian.campbell@citrix.com>
 L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
@@ -9160,6 +9278,13 @@ F:       Documentation/networking/z8530drv.txt
 F:     drivers/net/hamradio/*scc.c
 F:     drivers/net/hamradio/z8530.h
 
+ZBUD COMPRESSED PAGE ALLOCATOR
+M:     Seth Jennings <sjenning@linux.vnet.ibm.com>
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     mm/zbud.c
+F:     include/linux/zbud.h
+
 ZD1211RW WIRELESS DRIVER
 M:     Daniel Drake <dsd@gentoo.org>
 M:     Ulrich Kunitz <kune@deine-taler.de>
@@ -9182,6 +9307,12 @@ M:       "Maciej W. Rozycki" <macro@linux-mips.org>
 S:     Maintained
 F:     drivers/tty/serial/zs.*
 
+ZSWAP COMPRESSED SWAP CACHING
+M:     Seth Jennings <sjenning@linux.vnet.ibm.com>
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     mm/zswap.c
+
 THE REST
 M:     Linus Torvalds <torvalds@linux-foundation.org>
 L:     linux-kernel@vger.kernel.org