summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-11-02 02:13:48 -0400
committerDavid S. Miller <davem@davemloft.net>2013-11-02 02:13:48 -0400
commit296c10639a33941d0090afa17b7535fcbf81d97a (patch)
treef85819ef71b07bcf004c7971fa66c9f68a45bd74 /lib
parente139862eeec985d7139b11b09deeb9a32e3f3af2 (diff)
parent1c5ad13f7c2b2afe30e43858d04fff979dc9d243 (diff)
downloadlinux-296c10639a33941d0090afa17b7535fcbf81d97a.tar.gz
linux-296c10639a33941d0090afa17b7535fcbf81d97a.tar.bz2
linux-296c10639a33941d0090afa17b7535fcbf81d97a.zip
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>
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions