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)
commitb74d3feccc3f5e6e4cf98cf88daa2e0cdbc4ca62
tree651a6736040bd5084916ed9c461817fb0cbbe52b
parentf518338b16038beeb73e155e60d0f70beb9379f4
parentf9b8c4c8baded129535d82d74df8e87a7a369f54
Merge branch 'fixes' of git://git./linux/kernel/git/jesse/openvswitch

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>