Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Nov 2012 23:00:47 +0000 (18:00 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Nov 2012 23:00:47 +0000 (18:00 -0500)
Two small openswitch fixes from Jesse Gross.

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

Trivial merge