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

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 65730838dca4ca3722824943f82d637a611fcf7a..d7e0cfb1774595866e71e890a7e93572733a8a5a 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>
@@ -1301,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
@@ -1876,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)
@@ -2319,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)
@@ -2717,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
@@ -7049,8 +7069,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>
@@ -9256,6 +9275,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>
@@ -9278,6 +9304,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