• D
    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next · 65db611a
    David S. Miller 提交于
    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: NDavid S. Miller <davem@davemloft.net>
    65db611a
xfrm_policy.c 75.8 KB