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)
commita45085f6a7801f95cd5682290195224e268627fd
treef421e7fb8eef5c22f7aa4798f7f69d71fe211b82
parent3ed7147189d2fbe8ac6da95db2fd9d6d52f53ce9
parentd04d382980c86bdee9960c3eb157a73f8ed230cc
Merge branch 'fixes' of git://git./linux/kernel/git/jesse/openvswitch

Two small openswitch fixes from Jesse Gross.

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