diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-19 13:53:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-19 13:53:39 -0500 |
| commit | 748a70997443cff983b44fe5888dccbef4183cd3 (patch) | |
| tree | 8911e300a43207a53050bb5c639a074cd3b0380c /MAINTAINERS | |
| parent | 566bd54b067d5242043ce0560906bf4a2e3de289 (diff) | |
| parent | 22b371cbb949e1c8ee4accfead5ee9f3e7f0c114 (diff) | |
| download | linux-748a70997443cff983b44fe5888dccbef4183cd3.tar.gz linux-748a70997443cff983b44fe5888dccbef4183cd3.tar.bz2 linux-748a70997443cff983b44fe5888dccbef4183cd3.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2017-12-18
Here's the first bluetooth-next pull request for the 4.16 kernel.
- hci_ll: multiple cleanups & fixes
- Remove Gustavo Padovan from the MAINTAINERS file
- Support BLE Adversing while connected (if the controller can do it)
- DT updates for TI chips
- Various other smaller cleanups & fixes
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 810415d10b03..129c591e0f34 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2689,7 +2689,6 @@ F: drivers/mtd/devices/block2mtd.c BLUETOOTH DRIVERS M: Marcel Holtmann <marcel@holtmann.org> -M: Gustavo Padovan <gustavo@padovan.org> M: Johan Hedberg <johan.hedberg@gmail.com> L: linux-bluetooth@vger.kernel.org W: http://www.bluez.org/ @@ -2700,7 +2699,6 @@ F: drivers/bluetooth/ BLUETOOTH SUBSYSTEM M: Marcel Holtmann <marcel@holtmann.org> -M: Gustavo Padovan <gustavo@padovan.org> M: Johan Hedberg <johan.hedberg@gmail.com> L: linux-bluetooth@vger.kernel.org W: http://www.bluez.org/ |