Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 97762ad..e51d018 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>
@@ -747,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
@@ -1328,6 +1333,12 @@ S:       Supported
 F:     arch/arm/mach-zynq/
 F:     drivers/cpuidle/cpuidle-zynq.c
 
+ARM SMMU DRIVER
+M:     Will Deacon <will.deacon@arm.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/iommu/arm-smmu.c
+
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:     Catalin Marinas <catalin.marinas@arm.com>
 M:     Will Deacon <will.deacon@arm.com>
@@ -2327,6 +2338,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)
@@ -2725,12 +2741,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
@@ -5488,9 +5506,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>
@@ -6391,7 +6412,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
@@ -6501,7 +6522,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>
@@ -6553,8 +6574,8 @@ S:        Maintained
 F:     drivers/media/usb/pwc/*
 
 PWM SUBSYSTEM
-M:     Thierry Reding <thierry.reding@avionic-design.de>
-L:     linux-kernel@vger.kernel.org
+M:     Thierry Reding <thierry.reding@gmail.com>
+L:     linux-pwm@vger.kernel.org
 S:     Maintained
 W:     http://gitorious.org/linux-pwm
 T:     git git://gitorious.org/linux-pwm/linux-pwm.git
@@ -7199,7 +7220,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
@@ -8869,6 +8890,7 @@ M:        "Michael S. Tsirkin" <mst@redhat.com>
 L:     virtualization@lists.linux-foundation.org
 S:     Maintained
 F:     drivers/virtio/
+F:     tools/virtio/
 F:     drivers/net/virtio_net.c
 F:     drivers/block/virtio_blk.c
 F:     include/linux/virtio_*.h
@@ -8964,7 +8986,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/
@@ -9263,6 +9285,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>
@@ -9285,6 +9314,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