diff options
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f35a259a6564..9e63f919922f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -742,7 +742,7 @@ S: Maintained | |||
742 | F: arch/arm/mach-highbank/ | 742 | F: arch/arm/mach-highbank/ |
743 | 743 | ||
744 | ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT | 744 | ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT |
745 | M: Anton Vorontsov <avorontsov@mvista.com> | 745 | M: Anton Vorontsov <anton@enomsg.org> |
746 | S: Maintained | 746 | S: Maintained |
747 | F: arch/arm/mach-cns3xxx/ | 747 | F: arch/arm/mach-cns3xxx/ |
748 | T: git git://git.infradead.org/users/cbou/linux-cns3xxx.git | 748 | T: git git://git.infradead.org/users/cbou/linux-cns3xxx.git |
@@ -6314,7 +6314,7 @@ F: include/linux/timer* | |||
6314 | F: kernel/*timer* | 6314 | F: kernel/*timer* |
6315 | 6315 | ||
6316 | POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS | 6316 | POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS |
6317 | M: Anton Vorontsov <cbou@mail.ru> | 6317 | M: Anton Vorontsov <anton@enomsg.org> |
6318 | M: David Woodhouse <dwmw2@infradead.org> | 6318 | M: David Woodhouse <dwmw2@infradead.org> |
6319 | T: git git://git.infradead.org/battery-2.6.git | 6319 | T: git git://git.infradead.org/battery-2.6.git |
6320 | S: Maintained | 6320 | S: Maintained |
@@ -6424,7 +6424,7 @@ S: Maintained | |||
6424 | F: drivers/block/ps3vram.c | 6424 | F: drivers/block/ps3vram.c |
6425 | 6425 | ||
6426 | PSTORE FILESYSTEM | 6426 | PSTORE FILESYSTEM |
6427 | M: Anton Vorontsov <cbouatmailru@gmail.com> | 6427 | M: Anton Vorontsov <anton@enomsg.org> |
6428 | M: Colin Cross <ccross@android.com> | 6428 | M: Colin Cross <ccross@android.com> |
6429 | M: Kees Cook <keescook@chromium.org> | 6429 | M: Kees Cook <keescook@chromium.org> |
6430 | M: Tony Luck <tony.luck@intel.com> | 6430 | M: Tony Luck <tony.luck@intel.com> |
@@ -7122,7 +7122,7 @@ F: drivers/mmc/host/sdhci.* | |||
7122 | F: drivers/mmc/host/sdhci-pltfm.[ch] | 7122 | F: drivers/mmc/host/sdhci-pltfm.[ch] |
7123 | 7123 | ||
7124 | SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF) | 7124 | SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF) |
7125 | M: Anton Vorontsov <avorontsov@ru.mvista.com> | 7125 | M: Anton Vorontsov <anton@enomsg.org> |
7126 | L: linuxppc-dev@lists.ozlabs.org | 7126 | L: linuxppc-dev@lists.ozlabs.org |
7127 | L: linux-mmc@vger.kernel.org | 7127 | L: linux-mmc@vger.kernel.org |
7128 | S: Maintained | 7128 | S: Maintained |