1 files changed, 77 insertions, 13 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index fce05c4dc4e7..091b50edaf35 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -868,14 +868,7 @@ F:	arch/arm/mach-prima2/
 F:      drivers/clk/clk-prima2.c
 F:      drivers/clocksource/timer-prima2.c
 F:      drivers/clocksource/timer-marco.c
-F:      drivers/dma/sirf-dma.c
-F:      drivers/i2c/busses/i2c-sirf.c
-F:      drivers/input/misc/sirfsoc-onkey.c
-F:      drivers/irqchip/irq-sirfsoc.c
-F:      drivers/mmc/host/sdhci-sirf.c
-F:      drivers/pinctrl/sirf/
-F:      drivers/rtc/rtc-sirfsoc.c
-F:      drivers/spi/spi-sirf.c
+N:      [^a-z]sirf
 
 ARM/EBSA110 MACHINE SUPPORT
 M:      Russell King <linux@arm.linux.org.uk>
@@ -2222,6 +2215,7 @@ F:	include/linux/clk.h
 CLOCKSOURCE, CLOCKEVENT DRIVERS
 M:      Daniel Lezcano <daniel.lezcano@linaro.org>
 M:      Thomas Gleixner <tglx@linutronix.de>
+L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:      Supported
 F:      drivers/clocksource
@@ -4023,6 +4017,7 @@ F:	include/uapi/linux/hid*
 
 HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
 M:      Thomas Gleixner <tglx@linutronix.de>
+L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:      Maintained
 F:      Documentation/timers/
@@ -4694,6 +4689,7 @@ F:	net/irda/
 
 IRQ SUBSYSTEM
 M:      Thomas Gleixner <tglx@linutronix.de>
+L:      linux-kernel@vger.kernel.org
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 F:      kernel/irq/
@@ -5325,6 +5321,7 @@ F:	drivers/media/usb/dvb-usb-v2/lmedm04*
 LOCKDEP AND LOCKSTAT
 M:      Peter Zijlstra <peterz@infradead.org>
 M:      Ingo Molnar <mingo@redhat.com>
+L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking
 S:      Maintained
 F:      Documentation/lockdep*.txt
@@ -5421,6 +5418,16 @@ W:	http://www.tazenda.demon.co.uk/phil/linux-hp
 S:      Maintained
 F:      arch/m68k/hp300/
 
+M88DS3103 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/m88ds3103*
+
 M88RS2000 MEDIA DRIVER
 M:      Malcolm Priestley <tvboxspy@gmail.com>
 L:      linux-media@vger.kernel.org
@@ -5429,6 +5436,16 @@ Q:	http://patchwork.linuxtv.org/project/linux-media/list/
 S:      Maintained
 F:      drivers/media/dvb-frontends/m88rs2000*
 
+M88TS2022 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/tuners/m88ts2022*
+
 MA901 MASTERKIT USB FM RADIO DRIVER
 M:      Alexey Klimov <klimov.linux@gmail.com>
 L:      linux-media@vger.kernel.org
@@ -6622,6 +6639,7 @@ M:	Peter Zijlstra <a.p.zijlstra@chello.nl>
 M:      Paul Mackerras <paulus@samba.org>
 M:      Ingo Molnar <mingo@redhat.com>
 M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
+L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:      Supported
 F:      kernel/events/*
@@ -6745,6 +6763,7 @@ F:	drivers/scsi/pm8001/
 
 POSIX CLOCKS and TIMERS
 M:      Thomas Gleixner <tglx@linutronix.de>
+L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:      Supported
 F:      fs/timerfd.c
@@ -7153,6 +7172,7 @@ F:	drivers/net/wireless/ray*
 RCUTORTURE MODULE
 M:      Josh Triplett <josh@freedesktop.org>
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+L:      linux-kernel@vger.kernel.org
 S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:      Documentation/RCU/torture.txt
@@ -7160,6 +7180,7 @@ F:	kernel/rcu/torture.c
 
 RCUTORTURE TEST FRAMEWORK
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+L:      linux-kernel@vger.kernel.org
 S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:      tools/testing/selftests/rcutorture
@@ -7183,6 +7204,7 @@ F:	net/rds/
 READ-COPY UPDATE (RCU)
 M:      Dipankar Sarma <dipankar@in.ibm.com>
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+L:      linux-kernel@vger.kernel.org
 W:      http://www.rdrop.com/users/paulmck/RCU/
 S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
@@ -7462,6 +7484,13 @@ L:	linux-media@vger.kernel.org
 S:      Supported
 F:      drivers/media/i2c/s5c73m3/*
 
+SAMSUNG S5K5BAF CAMERA DRIVER
+M:      Kyungmin Park <kyungmin.park@samsung.com>
+M:      Andrzej Hajda <a.hajda@samsung.com>
+L:      linux-media@vger.kernel.org
+S:      Supported
+F:      drivers/media/i2c/s5k5baf.c
+
 SAMSUNG SOC CLOCK DRIVERS
 M:      Tomasz Figa <t.figa@samsung.com>
 S:      Supported
@@ -7492,6 +7521,7 @@ F:	drivers/mmc/host/dw_mmc*
 TIMEKEEPING, CLOCKSOURCE CORE, NTP
 M:      John Stultz <john.stultz@linaro.org>
 M:      Thomas Gleixner <tglx@linutronix.de>
+L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:      Supported
 F:      include/linux/clocksource.h
@@ -7517,6 +7547,7 @@ F:	drivers/watchdog/sc1200wdt.c
 SCHEDULER
 M:      Ingo Molnar <mingo@redhat.com>
 M:      Peter Zijlstra <peterz@infradead.org>
+L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
 S:      Maintained
 F:      kernel/sched/
@@ -7763,7 +7794,7 @@ L:	linux-media@vger.kernel.org
 T:      git git://linuxtv.org/media_tree.git
 W:      http://linuxtv.org
 S:      Odd Fixes
-F:      drivers/media/radio/si4713-i2c.?
+F:      drivers/media/radio/si4713/si4713.?
 
 SI4713 FM RADIO TRANSMITTER PLATFORM DRIVER
 M:      Eduardo Valentin <edubezval@gmail.com>
@@ -7771,7 +7802,15 @@ L:	linux-media@vger.kernel.org
 T:      git git://linuxtv.org/media_tree.git
 W:      http://linuxtv.org
 S:      Odd Fixes
-F:      drivers/media/radio/radio-si4713.c
+F:      drivers/media/radio/si4713/radio-platform-si4713.c
+
+SI4713 FM RADIO TRANSMITTER USB DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/si4713/radio-usb-si4713.c
 
 SIANO DVB DRIVER
 M:      Mauro Carvalho Chehab <m.chehab@samsung.com>
@@ -7884,6 +7923,7 @@ F:	mm/sl?b.c
 SLEEPABLE READ-COPY UPDATE (SRCU)
 M:      Lai Jiangshan <laijs@cn.fujitsu.com>
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+L:      linux-kernel@vger.kernel.org
 W:      http://www.rdrop.com/users/paulmck/RCU/
 S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
@@ -8622,6 +8662,14 @@ L:	linux-xtensa@linux-xtensa.org
 S:      Maintained
 F:      arch/xtensa/
 
+THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-raremono.c
+
 THERMAL
 M:      Zhang Rui <rui.zhang@intel.com>
 M:      Eduardo Valentin <eduardo.valentin@ti.com>
@@ -8960,7 +9008,7 @@ UNSORTED BLOCK IMAGES (UBI)
 M:      Artem Bityutskiy <dedekind1@gmail.com>
 W:      http://www.linux-mtd.infradead.org/
 L:      linux-mtd@lists.infradead.org
-T:      git git://git.infradead.org/ubi-2.6.git
+T:      git git://git.infradead.org/ubifs-2.6.git
 S:      Maintained
 F:      drivers/mtd/ubi/
 F:      include/linux/mtd/ubi.h
@@ -9154,8 +9202,7 @@ L:	linux-media@vger.kernel.org
 T:      git git://linuxtv.org/media_tree.git
 W:      http://www.linux-projects.org
 S:      Maintained
-F:      Documentation/video4linux/sn9c102.txt
-F:      drivers/media/usb/sn9c102/
+F:      drivers/staging/media/sn9c102/
 
 USB SUBSYSTEM
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -9587,6 +9634,7 @@ M:	Thomas Gleixner <tglx@linutronix.de>
 M:      Ingo Molnar <mingo@redhat.com>
 M:      "H. Peter Anvin" <hpa@zytor.com>
 M:      x86@kernel.org
+L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
 S:      Maintained
 F:      Documentation/x86/
@@ -9740,11 +9788,27 @@ T:	Mercurial http://linuxtv.org/hg/v4l-dvb
 S:      Odd Fixes
 F:      drivers/media/pci/zoran/
 
+ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
+M:      Minchan Kim <minchan@kernel.org>
+M:      Nitin Gupta <ngupta@vflare.org>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/block/zram/
+F:      Documentation/blockdev/zram.txt
+
 ZS DECSTATION Z85C30 SERIAL DRIVER
 M:      "Maciej W. Rozycki" <macro@linux-mips.org>
 S:      Maintained
 F:      drivers/tty/serial/zs.*
 
+ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR
+M:      Minchan Kim <minchan@kernel.org>
+M:      Nitin Gupta <ngupta@vflare.org>
+L:      linux-mm@kvack.org
+S:      Maintained
+F:      mm/zsmalloc.c
+F:      include/linux/zsmalloc.h
+
 ZSWAP COMPRESSED SWAP CACHING
 M:      Seth Jennings <sjenning@linux.vnet.ibm.com>
 L:      linux-mm@kvack.org