| commit | edc1bb0bd7d409f62ed7ba462ca5313be95cbed3 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jul 07 19:39:34 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jul 07 19:39:34 2014 -0700 |
| tree | 1b3bd0ce4f3041365d31495fba900d1dccf9da55 | |
| parent | 11ef7a8996d5d433c9cd75d80651297eccbf6d42 [diff] | |
| parent | 4a46b24e147dfa9b858026da02cad0bdd4e149d2 [diff] |
Merge branch 'net_ovs_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch Pravin B Shelar says: ==================== Open vSwitch A set of fixes for net. First bug is related flow-table management. Second one is in sample action. Third is related flow stats and last one add gre-err handler for ovs. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>