Commit 7fcaf731 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'ieee802154-for-davem-2020-06-19' of... 

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 54eeea0d e795a61a

Documentation/networking/ieee802154.rst

+2 −2
Original line number Original line Diff line number Diff line
@@ -30,8 +30,8 @@ Socket API 




The address family, socket addresses etc. are defined in the

The address family, socket addresses etc. are defined in the

include/net/af_ieee802154.h header or in the special header

include/net/af_ieee802154.h header or in the special header

in the userspace package (see either http://wpan.cakelab.org/ or the

in the userspace package (see either https://linux-wpan.org/wpan-tools.html

git tree at https://github.com/linux-wpan/wpan-tools).

or the git tree at https://github.com/linux-wpan/wpan-tools).





6LoWPAN Linux implementation

6LoWPAN Linux implementation

============================

============================

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -8333,7 +8333,7 @@ M: Alexander Aring <alex.aring@gmail.com> 
M:	Stefan Schmidt <stefan@datenfreihafen.org>

M:	Stefan Schmidt <stefan@datenfreihafen.org>

L:	linux-wpan@vger.kernel.org

L:	linux-wpan@vger.kernel.org

S:	Maintained

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.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next.git

F:	Documentation/networking/ieee802154.rst

F:	Documentation/networking/ieee802154.rst

CRA Git | Maintained and supported by SUSTech CRA and CCSE