projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e139862 1c5ad13)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Sat, 2 Nov 2013 06:13:48 +0000 (02:13 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 2 Nov 2013 06:13:48 +0000 (02:13 -0400)
commit296c10639a33941d0090afa17b7535fcbf81d97a
treef85819ef71b07bcf004c7971fa66c9f68a45bd74tree | snapshot (tar.gz zip)
parente139862eeec985d7139b11b09deeb9a32e3f3af2commit | diff
parent1c5ad13f7c2b2afe30e43858d04fff979dc9d243commit | diff
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next

Conflicts:
net/xfrm/xfrm_policy.c

Minor merge conflict in xfrm_policy.c, consisting of overlapping
changes which were trivial to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/esp6.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history