diff options
author | David S. Miller <davem@davemloft.net> | 2018-02-27 11:14:57 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-02-27 11:14:57 -0500 |
commit | afdd6ae352527b83a3e13c040b22f455fe6537db (patch) | |
tree | afe045b5090b2e38629c68623bd7a9daa1648970 /MAINTAINERS | |
parent | 23363b87a80a2eeb366c9b5b93248b7d73125ba8 (diff) | |
parent | 8c6ad9cc51574c8f20b5777e97b42457802ac36d (diff) |
Merge branch 'ieee802154-for-davem-2018-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next
Stefan Schmidt says:
====================
pull-request: ieee802154-next 2018-02-26
An update from ieee802154 for *net-next*
Alexander corrected a setting which got lost during some 6lowpan rework
a while back and Xue Liu provided us with a new driver for the MCR20A
transceiver.
If there are any issues let me know. If not, please pull.
====================
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 93a12af4f180..e0b39004edc0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8592,6 +8592,15 @@ S: Maintained F: Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531 F: drivers/iio/potentiometer/mcp4531.c +MCR20A IEEE-802.15.4 RADIO DRIVER +M: Xue Liu <liuxuenetmail@gmail.com> +L: linux-wpan@vger.kernel.org +W: https://github.com/xueliu/mcr20a-linux +S: Maintained +F: drivers/net/ieee802154/mcr20a.c +F: drivers/net/ieee802154/mcr20a.h +F: Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt + MEASUREMENT COMPUTING CIO-DAC IIO DRIVER M: William Breathitt Gray <vilhelm.gray@gmail.com> L: linux-iio@vger.kernel.org |