Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes in xfrm_device.c, between the double ESP trailing bug fix setting the XFRM_INIT flag and the changes in net-next preparing for bonding encryption support. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -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
|
||||
============================
|
||||
|
Reference in New Issue
Block a user