From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 May 2014 20:00:00 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Tag: v3.16-rc1~27^2~155
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65db611a5cc17182b62c0edc4bf31cf272d58304;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2014-05-22

This is the last ipsec pull request before I leave for
a three weeks vacation tomorrow. David, can you please
take urgent ipsec patches directly into net/net-next
during this time?

I'll continue to run the ipsec/ipsec-next trees as soon
as I'm back.

1) Simplify the xfrm audit handling, from Tetsuo Handa.

2) Codingstyle cleanup for xfrm_output, from abian Frederick.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

65db611a5cc17182b62c0edc4bf31cf272d58304