diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-15 00:31:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-15 00:31:22 +0200 |
| commit | 09ce069dff607f86dcdeb541d20734a8f42478c5 (patch) | |
| tree | 03c7e9dc78d4dbfc2b3687053bbbd1680789934d /net/sctp/sm_sideeffect.c | |
| parent | net/mlx4: Add VF link state support (diff) | |
| parent | openvswitch: Simplify interface ovs_flow_metadata_from_nlattrs() (diff) | |
| download | linux-09ce069dff607f86dcdeb541d20734a8f42478c5.tar.xz linux-09ce069dff607f86dcdeb541d20734a8f42478c5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says:
====================
A few miscellaneous improvements and cleanups before the GRE tunnel
integration series. Intended for net-next/3.11.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_sideeffect.c')
0 files changed, 0 insertions, 0 deletions