diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-26 10:22:53 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-26 10:22:53 -0500 |
| commit | a81e4affe1789a3d1010f219ad53382a760aa2ea (patch) | |
| tree | 73ea99e882beec7435f49b370ef5d8527ac361ef /net/key | |
| parent | 5b09179e7fa2849a0c95d14bb69416693e0ed0c3 (diff) | |
| parent | 50bd870a9e5cca9fcf5fb4c130c373643d7d9906 (diff) | |
| download | linux-a81e4affe1789a3d1010f219ad53382a760aa2ea.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions