From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 Aug 2013 23:04:41 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Tag: v3.12-rc1~132^2~199
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=baf3b3f227e6d2c143a03f03dcbd50b55089eda4;p=profile%2Fcommon%2Fkernel-common.git

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

Steffen Klassert says:

====================
1) Some constifications, from Mathias Krause.

2) Catch bugs if a hold timer is still active when xfrm_policy_destroy()
   is called, from Fan Du.

3) Remove a redundant address family checking, from Fan Du.

4) Make xfrm_state timer monotonic to be independent of system clock changes,
   from Fan Du.

5) Remove an outdated comment on returning -EREMOTE in the xfrm_lookup(),
   from Rami Rosen.

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

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

baf3b3f227e6d2c143a03f03dcbd50b55089eda4