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	ebf2d486f35e6ae81fdae78d58da5dac99eb6a41
tree	f85819ef71b07bcf004c7971fa66c9f68a45bd74	tree \| snapshot
parent	16dcf722c9e90ab5ada26822d3b40840cabcb0c1	commit \| diff
parent	3a32843518fb0afbf4ea5d449718ead42c58cc24	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