git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ad81f05)
openvswitch: Fix bad merge resolution.
authorJesse Gross <jesse@nicira.com>
Mon, 13 May 2013 15:41:06 +0000 (08:41 -0700)
committerJesse Gross <jesse@nicira.com>
Wed, 14 Aug 2013 22:48:02 +0000 (15:48 -0700)
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>

No differences found
Pandora Kernel Repository