]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 Aug 2013 08:41:10 +0000 (01:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Aug 2013 08:41:10 +0000 (01:41 -0700)
Jesse Gross says:

====================
Three bug fixes that are fairly small either way but resolve obviously
incorrect code. For net/3.11.
====================

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

Trivial merge