diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-11 05:15:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-11 05:15:30 -0700 |
| commit | 7bcfeead48b6f920007ee41bc70a83b58c5ba396 (patch) | |
| tree | 53c662af01d9a12e7cf2faee91637bf19ea19a82 /MAINTAINERS | |
| parent | 8fae307c8fe9789ff1f4161dcb2db0d689069448 (diff) | |
| parent | f640ee98bbeaa169684a571e0b96bea563bb6015 (diff) | |
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-10-08
Here's another set of Bluetooth & 802.15.4 patches for the 4.4 kernel.
802.15.4:
- Many improvements & fixes to the mrf24j40 driver
- Fixes and cleanups to nl802154, mac802154 & ieee802154 code
Bluetooth:
- New chipset support in btmrvl driver
- Fixes & cleanups to btbcm, btmrvl, bpa10x & btintel drivers
- Support for vendor specific diagnostic data through common API
- Cleanups to the 6lowpan code
- New events & message types for monitor channel
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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c22e13e80b6a..4d0171c4f6d8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6978,6 +6978,7 @@ M: Alan Ott <alan@signal11.us> L: linux-wpan@vger.kernel.org S: Maintained F: drivers/net/ieee802154/mrf24j40.c +F: Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt MSI LAPTOP SUPPORT M: "Lee, Chun-Yi" <jlee@suse.com> |