Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Jun 2013 22:31:22 +0000 (15:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Jun 2013 22:31:22 +0000 (15:31 -0700)
Jesse Gross says:

====================
A few miscellaneous improvements and cleanups before the GRE tunnel
integration series. Intended for net-next/3.11.
====================

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

Trivial merge