diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-06-20 21:30:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-20 21:30:23 -0700 |
| commit | 7fcaf73193e9d15f4d65d43aaf890fd3fbea1836 (patch) | |
| tree | e57ed40c1e5099fe2b8228622e622fa540a60fb8 | |
| parent | tc-testing: update geneve options match in tunnel_key unit tests (diff) | |
| parent | MAINTAINERS: update ieee802154 project website URL (diff) | |
| download | wireguard-linux-7fcaf73193e9d15f4d65d43aaf890fd3fbea1836.tar.xz wireguard-linux-7fcaf73193e9d15f4d65d43aaf890fd3fbea1836.zip | |
Merge tag 'ieee802154-for-davem-2020-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan
Stefan Schmidt says:
====================
pull-request: ieee802154 for net 2020-06-19
An update from ieee802154 for your *net* tree.
Just two small maintenance fixes to update references to the new project
homepage.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/networking/ieee802154.rst | 4 | ||||
| -rw-r--r-- | MAINTAINERS | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/networking/ieee802154.rst b/Documentation/networking/ieee802154.rst index 36ca823a1122..6f4bf8447a21 100644 --- a/Documentation/networking/ieee802154.rst +++ b/Documentation/networking/ieee802154.rst @@ -30,8 +30,8 @@ Socket API The address family, socket addresses etc. are defined in the include/net/af_ieee802154.h header or in the special header -in the userspace package (see either http://wpan.cakelab.org/ or the -git tree at https://github.com/linux-wpan/wpan-tools). +in the userspace package (see either https://linux-wpan.org/wpan-tools.html +or the git tree at https://github.com/linux-wpan/wpan-tools). 6LoWPAN Linux implementation ============================ diff --git a/MAINTAINERS b/MAINTAINERS index 301330e02bca..a09e61268c08 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8333,7 +8333,7 @@ M: Alexander Aring <alex.aring@gmail.com> M: Stefan Schmidt <stefan@datenfreihafen.org> L: linux-wpan@vger.kernel.org S: Maintained -W: http://wpan.cakelab.org/ +W: https://linux-wpan.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next.git F: Documentation/networking/ieee802154.rst |