ipv6: in case of link failure remove route directly instead of letting it expire

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 293c762f23d1cced0173ee6e51a89c34abc10f88..37f9a71c744f38c4b8b0e2671eda3871425d0d25 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -752,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
@@ -5500,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>
@@ -6403,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
@@ -6513,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>
@@ -6565,8 +6568,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
@@ -7211,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