diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-22 16:00:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-22 16:00:00 -0400 |
| commit | 65db611a5cc17182b62c0edc4bf31cf272d58304 (patch) | |
| tree | 51987fafb7ab0946369e0e4b4d713f2887b2d870 /drivers/scsi/vmw_pvscsi.h | |
| parent | b3f7a7b48f429e52f3d3dc36d253627c2a73803b (diff) | |
| parent | fc68086ce888a10220c7c79a2a3b44cb85d4074c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'drivers/scsi/vmw_pvscsi.h')
0 files changed, 0 insertions, 0 deletions