projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5b09179 50bd870)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Fri, 26 Jan 2018 15:22:53 +0000 (10:22 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Jan 2018 15:22:53 +0000 (10:22 -0500)
commita81e4affe1789a3d1010f219ad53382a760aa2ea
tree73ea99e882beec7435f49b370ef5d8527ac361eftree | snapshot
parent5b09179e7fa2849a0c95d14bb69416693e0ed0c3commit | diff
parent50bd870a9e5cca9fcf5fb4c130c373643d7d9906commit | diff
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2018-01-26

One last patch for this development cycle:

1) Add ESN support for IPSec HW offload.
   From Yossef Efraim.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netdevice.h diff1 | diff2 | blob | history
net/xfrm/xfrm_device.c diff1 | diff2 | blob | history
John Crispins staging tree