diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0b568b6f1163..3ea1af5c2709 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1521,8 +1521,8 @@ M: Gustavo Padovan <gustavo@padovan.org> | |||
1521 | M: Johan Hedberg <johan.hedberg@gmail.com> | 1521 | M: Johan Hedberg <johan.hedberg@gmail.com> |
1522 | L: linux-bluetooth@vger.kernel.org | 1522 | L: linux-bluetooth@vger.kernel.org |
1523 | W: http://www.bluez.org/ | 1523 | W: http://www.bluez.org/ |
1524 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git | 1524 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git |
1525 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git | 1525 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git |
1526 | S: Maintained | 1526 | S: Maintained |
1527 | F: drivers/bluetooth/ | 1527 | F: drivers/bluetooth/ |
1528 | 1528 | ||
@@ -1532,8 +1532,8 @@ M: Gustavo Padovan <gustavo@padovan.org> | |||
1532 | M: Johan Hedberg <johan.hedberg@gmail.com> | 1532 | M: Johan Hedberg <johan.hedberg@gmail.com> |
1533 | L: linux-bluetooth@vger.kernel.org | 1533 | L: linux-bluetooth@vger.kernel.org |
1534 | W: http://www.bluez.org/ | 1534 | W: http://www.bluez.org/ |
1535 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git | 1535 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git |
1536 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git | 1536 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git |
1537 | S: Maintained | 1537 | S: Maintained |
1538 | F: net/bluetooth/ | 1538 | F: net/bluetooth/ |
1539 | F: include/net/bluetooth/ | 1539 | F: include/net/bluetooth/ |
@@ -2321,9 +2321,9 @@ S: Supported | |||
2321 | F: drivers/acpi/dock.c | 2321 | F: drivers/acpi/dock.c |
2322 | 2322 | ||
2323 | DOCUMENTATION | 2323 | DOCUMENTATION |
2324 | M: Randy Dunlap <rdunlap@xenotime.net> | 2324 | M: Rob Landley <rob@landley.net> |
2325 | L: linux-doc@vger.kernel.org | 2325 | L: linux-doc@vger.kernel.org |
2326 | T: quilt http://xenotime.net/kernel-doc-patches/current/ | 2326 | T: TBD |
2327 | S: Maintained | 2327 | S: Maintained |
2328 | F: Documentation/ | 2328 | F: Documentation/ |
2329 | 2329 | ||
@@ -4533,8 +4533,7 @@ S: Supported | |||
4533 | F: drivers/net/ethernet/myricom/myri10ge/ | 4533 | F: drivers/net/ethernet/myricom/myri10ge/ |
4534 | 4534 | ||
4535 | NATSEMI ETHERNET DRIVER (DP8381x) | 4535 | NATSEMI ETHERNET DRIVER (DP8381x) |
4536 | M: Tim Hockin <thockin@hockin.org> | 4536 | S: Orphan |
4537 | S: Maintained | ||
4538 | F: drivers/net/ethernet/natsemi/natsemi.c | 4537 | F: drivers/net/ethernet/natsemi/natsemi.c |
4539 | 4538 | ||
4540 | NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER | 4539 | NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER |
@@ -4803,6 +4802,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | |||
4803 | F: arch/arm/mach-omap2/clockdomain44xx.c | 4802 | F: arch/arm/mach-omap2/clockdomain44xx.c |
4804 | 4803 | ||
4805 | OMAP AUDIO SUPPORT | 4804 | OMAP AUDIO SUPPORT |
4805 | M: Peter Ujfalusi <peter.ujfalusi@ti.com> | ||
4806 | M: Jarkko Nikula <jarkko.nikula@bitmer.com> | 4806 | M: Jarkko Nikula <jarkko.nikula@bitmer.com> |
4807 | L: alsa-devel@alsa-project.org (subscribers-only) | 4807 | L: alsa-devel@alsa-project.org (subscribers-only) |
4808 | L: linux-omap@vger.kernel.org | 4808 | L: linux-omap@vger.kernel.org |
@@ -5117,6 +5117,11 @@ F: drivers/i2c/busses/i2c-pca-* | |||
5117 | F: include/linux/i2c-algo-pca.h | 5117 | F: include/linux/i2c-algo-pca.h |
5118 | F: include/linux/i2c-pca-platform.h | 5118 | F: include/linux/i2c-pca-platform.h |
5119 | 5119 | ||
5120 | PCDP - PRIMARY CONSOLE AND DEBUG PORT | ||
5121 | M: Khalid Aziz <khalid.aziz@hp.com> | ||
5122 | S: Maintained | ||
5123 | F: drivers/firmware/pcdp.* | ||
5124 | |||
5120 | PCI ERROR RECOVERY | 5125 | PCI ERROR RECOVERY |
5121 | M: Linas Vepstas <linasvepstas@gmail.com> | 5126 | M: Linas Vepstas <linasvepstas@gmail.com> |
5122 | L: linux-pci@vger.kernel.org | 5127 | L: linux-pci@vger.kernel.org |
@@ -6466,6 +6471,7 @@ S: Odd Fixes | |||
6466 | F: drivers/staging/olpc_dcon/ | 6471 | F: drivers/staging/olpc_dcon/ |
6467 | 6472 | ||
6468 | STAGING - OZMO DEVICES USB OVER WIFI DRIVER | 6473 | STAGING - OZMO DEVICES USB OVER WIFI DRIVER |
6474 | M: Rupesh Gujare <rgujare@ozmodevices.com> | ||
6469 | M: Chris Kelly <ckelly@ozmodevices.com> | 6475 | M: Chris Kelly <ckelly@ozmodevices.com> |
6470 | S: Maintained | 6476 | S: Maintained |
6471 | F: drivers/staging/ozwpan/ | 6477 | F: drivers/staging/ozwpan/ |
@@ -7461,8 +7467,7 @@ F: include/linux/wm97xx.h | |||
7461 | 7467 | ||
7462 | WOLFSON MICROELECTRONICS DRIVERS | 7468 | WOLFSON MICROELECTRONICS DRIVERS |
7463 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | 7469 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> |
7464 | M: Ian Lartey <ian@opensource.wolfsonmicro.com> | 7470 | L: patches@opensource.wolfsonmicro.com |
7465 | M: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> | ||
7466 | T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc | 7471 | T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc |
7467 | T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus | 7472 | T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus |
7468 | W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices | 7473 | W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices |