diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-17 15:00:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-17 15:00:57 -0400 |
| commit | 450cc8cce23d0db11b19fa89973ddb6d5edd010c (patch) | |
| tree | be70a3831b21b77f17e236bb452a2ced6066bf96 /MAINTAINERS | |
| parent | d584fec634a4426ad476657383d3a9049565f884 (diff) | |
| parent | 019aa56b7df8a796b2c01a56269a370ad3442ec7 (diff) | |
| download | linux-450cc8cce23d0db11b19fa89973ddb6d5edd010c.tar.gz linux-450cc8cce23d0db11b19fa89973ddb6d5edd010c.tar.bz2 linux-450cc8cce23d0db11b19fa89973ddb6d5edd010c.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-04-14
Here's the main batch of Bluetooth & 802.15.4 patches for the 4.12
kernel.
- Many fixes to 6LoWPAN, in particular for BLE
- New CA8210 IEEE 802.15.4 device driver (accounting for most of the
lines of code added in this pull request)
- Added Nokia Bluetooth (UART) HCI driver
- Some serdev & TTY changes that are dependencies for the Nokia
driver (with acks from relevant maintainers and an agreement that
these come through the bluetooth tree)
- Support for new Intel Bluetooth device
- Various other minor cleanups/fixes here and there
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 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 197387863297..7b4b82865179 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2944,6 +2944,15 @@ W: http://www.linux-c6x.org/wiki/index.php/Main_Page S: Maintained F: arch/c6x/ +CA8210 IEEE-802.15.4 RADIO DRIVER +M: Harry Morris <h.morris@cascoda.com> +M: linuxdev@cascoda.com +L: linux-wpan@vger.kernel.org +W: https://github.com/Cascoda/ca8210-linux.git +S: Maintained +F: drivers/net/ieee802154/ca8210.c +F: Documentation/devicetree/bindings/net/ieee802154/ca8210.txt + CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS M: David Howells <dhowells@redhat.com> L: linux-cachefs@redhat.com (moderated for non-subscribers) |