From: Jesse Gross <jesse@nicira.com>
Date: Mon, 13 May 2013 15:41:06 +0000 (-0700)
Subject: openvswitch: Fix bad merge resolution.
X-Git-Tag: v3.11-rc6~11^2~7^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30444e981ba28e892c439017fbc011d867f02a7d;p=pandora-kernel.git

openvswitch: Fix bad merge resolution.

git silently included an extra hunk in vport_cmd_set() during
automatic merging. This code is unreachable so it does not actually
introduce a problem but it is clearly incorrect.

Signed-off-by: Jesse Gross <jesse@nicira.com>
---

Reading git-diff-tree failed