diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-15 16:00:02 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-15 16:00:02 -0400 |
| commit | 1a63c353c856c9f6d44a533afb6ad6dbbcdea683 (patch) | |
| tree | a51c18f01c031a21f07ec3be07ffae210bb9adc7 /MAINTAINERS | |
| parent | 7662ff46b7b3678162ce125903115e4ab0607a2d (diff) | |
| parent | b3c0598952e02f1f1f6d003574549d940ecbf31a (diff) | |
| download | linux-stable-1a63c353c856c9f6d44a533afb6ad6dbbcdea683.tar.gz linux-stable-1a63c353c856c9f6d44a533afb6ad6dbbcdea683.tar.bz2 linux-stable-1a63c353c856c9f6d44a533afb6ad6dbbcdea683.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ba8603ce4441..c539910b1f76 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1358,16 +1358,19 @@ F: drivers/mtd/devices/block2mtd.c BLUETOOTH DRIVERS M: Marcel Holtmann <marcel@holtmann.org> +M: Gustavo F. Padovan <padovan@profusion.mobi> L: linux-bluetooth@vger.kernel.org W: http://www.bluez.org/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git S: Maintained F: drivers/bluetooth/ BLUETOOTH SUBSYSTEM M: Marcel Holtmann <marcel@holtmann.org> +M: Gustavo F. Padovan <padovan@profusion.mobi> L: linux-bluetooth@vger.kernel.org W: http://www.bluez.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git S: Maintained F: net/bluetooth/ F: include/net/bluetooth/ |