Merge branch 'master' into next

[openvswitch] / COPYING

diff --git a/COPYING b/COPYING
index 3f0659d0464af503530c77b273cf4fd91ee7cd2d..39dd45c674702fa451febef910b2c17a724ea435 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -46,3 +46,7 @@ The files under ovsdb/simplejson are covered by the following license:
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
     DEALINGS IN THE SOFTWARE.
+
+Files lib/sflow*.[ch] are licensed under the terms of the InMon sFlow
+licence that is available at:
+        http://www.inmon.com/technology/sflowlicense.txt