Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
authorDavid S. Miller <davem@davemloft.net>
Thu, 20 Mar 2014 21:29:02 +0000 (17:29 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Mar 2014 21:29:02 +0000 (17:29 -0400)
Jesse Gross says:

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

Four small fixes for net/3.14. I realize that these are late in the
cycle - just got back from vacation.
====================

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

Trivial merge