From: David S. Miller <davem@davemloft.net>
Date: Wed, 17 Apr 2013 17:30:32 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
X-Git-Tag: v3.10-rc1~66^2~111
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92cf1f23cc9390ea5c00e8185c1f7910c3d15452;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'master' of git://git./linux/kernel/git/jesse/openvswitch

Jesse Gross says:

====================
A number of improvements for net-next/3.10.

Highlights include:

 * Properly exposing linux/openvswitch.h to userspace after the uapi
   changes.

 * Simplification of locking. It immediately makes things simpler to
   reason about and avoids holding RTNL mutex for longer than
   necessary. In the near future it will also enable tunnel
   registration and more fine-grained locking.

 * Miscellaneous cleanups and simplifications.
====================

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

92cf1f23cc9390ea5c00e8185c1f7910c3d15452