| commit | 6b798d70d07a38e9ba0a32316f76495f9dcfc343 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Nov 06 16:33:13 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Thu Nov 06 16:33:13 2014 -0500 |
| tree | f1c6e7acc61511454ab27e8ecdb00dfdcc8766e8 | |
| parent | 271d70f4b7f2990c84138be267f8e42c33506cc7 [diff] | |
| parent | a85311bf1f9f8185682990cafdd4e0572c0ed373 [diff] |
Merge branch 'net_next_ovs' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch Pravin B Shelar says: ==================== Open vSwitch First two patches are related to OVS MPLS support. Rest of patches are mostly refactoring and minor improvements to openvswitch. v1-v2: - Fix conflicts due to "gue: Remote checksum offload" ==================== Signed-off-by: David S. Miller <davem@davemloft.net>