From: David S. Miller <davem@davemloft.net>
Date: Sun, 16 Nov 2014 19:59:01 +0000 (-0500)
Subject: Merge branch 'net_ovs' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openv... 
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~83^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6ab766e812570c506a4dc2215dc0da3229cfd67;p=pandora-kernel.git

Merge branch 'net_ovs' of git://git./linux/kernel/git/pshelar/openvswitch

Pravin B Shelar says:

====================
Open vSwitch

Following fixes are accumulated in ovs-repo.
Three of them are related to protocol processing, one is
related to memory leak in case of error and one is to
fix race.
Patch "Validate IPv6 flow key and mask values" has conflicts
with net-next, Let me know if you want me to send the patch
for net-next.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

c6ab766e812570c506a4dc2215dc0da3229cfd67
Reading git-diff-tree failed