diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-09 15:47:49 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-09 15:47:49 -0400 |
| commit | 41833af713457fe92f432a7354bc690587652879 (patch) | |
| tree | 6f821f85bd33c1823d557d1482f8aa6216cde5b3 /MAINTAINERS | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
| parent | 66f3b913e68e8e62bd2f9499495eeb6cc81b2662 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6d05ae236036..6010b9d13b47 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/ |