]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'ipsec/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 22:48:25 +0000 (08:48 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 22:48:25 +0000 (08:48 +1000)
1  2 
net/ipv4/esp4.c
net/ipv6/esp6.c

diff --cc net/ipv4/esp4.c
Simple merge
diff --cc net/ipv6/esp6.c
Simple merge