From: David S. Miller <davem@davemloft.net>
Date: Sat, 2 Nov 2013 06:13:48 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Tag: v3.13-rc1~105^2~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296c10639a33941d0090afa17b7535fcbf81d97a;p=pandora-kernel.git

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>
---

296c10639a33941d0090afa17b7535fcbf81d97a
Reading git-diff-tree failed