git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Sat, 2 Nov 2013 06:13:48 +0000 (02:13 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sat, 2 Nov 2013 06:13:48 +0000 (02:13 -0400)
commit	baa8e62ed638b0a340621096e953af0b006311d2
tree	f85819ef71b07bcf004c7971fa66c9f68a45bd74	tree \| snapshot
parent	ba4bede5e6a1ae49286f90e5471212c78006735d	commit \| diff
parent	d80f6fe5b99774c25b9e84bd511e40edd1b95617	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/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

Linux Kernel Source Tree.

RSS Atom

net/ipv6/esp6.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history