diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-14 16:23:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-14 16:23:10 -0500 |
| commit | 5148371a752234181ac73ea388863faeaf4dd66c (patch) | |
| tree | 3cab25602dd57ce88c073a4321706717b3f0dd3d /MAINTAINERS | |
| parent | 7e074af2273a6e3115ff7c35529081ab52f8a9e9 (diff) | |
| parent | 7302b9d90117496049dd4bfa28755f7c2ed55b27 (diff) | |
| download | linux-5148371a752234181ac73ea388863faeaf4dd66c.tar.gz linux-5148371a752234181ac73ea388863faeaf4dd66c.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-12-11
Here's another set of Bluetooth & 802.15.4 patches for the 4.5 kernel:
- 6LoWPAN debugfs support
- New 802.15.4 driver for ADF7242 MAC IEEE802154
- Initial code for 6LoWPAN Generic Header Compression (GHC) support
- Refactor Bluetooth LE scan & advertising behind dedicated workqueue
- Cleanups to Bluetooth H:5 HCI driver
- Support for Toshiba Broadcom based Bluetooth controllers
- Use continuous scanning when establishing Bluetooth LE connections
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 ab79736f32cd..04e8d181b44c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -371,6 +371,15 @@ ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR) M: Jiri Kosina <jikos@kernel.org> S: Maintained +ADF7242 IEEE 802.15.4 RADIO DRIVER +M: Michael Hennerich <michael.hennerich@analog.com> +W: https://wiki.analog.com/ADF7242 +W: http://ez.analog.com/community/linux-device-drivers +L: linux-wpan@vger.kernel.org +S: Supported +F: drivers/net/ieee802154/adf7242.c +F: Documentation/devicetree/bindings/net/ieee802154/adf7242.txt + ADM1025 HARDWARE MONITOR DRIVER M: Jean Delvare <jdelvare@suse.com> L: lm-sensors@lm-sensors.org |