From 25f945aa34e5d8ec625d5d93bcc36cf1dc89e2e1 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Tue, 2 Oct 2012 11:17:55 -0700
Subject: [PATCH] --- yaml --- r: 353537 b: refs/heads/master c:
 bd085b93851c69e984dc11a9fb359ee388c1e7d2 h: refs/heads/master i:   353535:
 d3e4fdc3dda724c263171826595e2fdcb54a8635 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/Kconfig | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2ea82f9c0fc6..c386742fecff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d0e137dc049c71121119cea4499175a91ed74fd
+refs/heads/master: bd085b93851c69e984dc11a9fb359ee388c1e7d2
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index 6a70184c3f23..2334190ff8d2 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -123,8 +123,7 @@ config IFB
 source "drivers/net/team/Kconfig"
 
 config MACVLAN
-	tristate "MAC-VLAN support (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
+	tristate "MAC-VLAN support"
 	---help---
 	  This allows one to create virtual interfaces that map packets to
 	  or from specific MAC addresses to a particular interface.
@@ -138,7 +137,7 @@ config MACVLAN
 	  will be called macvlan.
 
 config MACVTAP
-	tristate "MAC-VLAN based tap driver (EXPERIMENTAL)"
+	tristate "MAC-VLAN based tap driver"
 	depends on MACVLAN
 	help
 	  This adds a specialized tap character device driver that is based
@@ -234,8 +233,8 @@ config VETH
 	  versa.
 
 config VIRTIO_NET
-	tristate "Virtio network driver (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && VIRTIO
+	tristate "Virtio network driver"
+	depends on VIRTIO
 	---help---
 	  This is the virtual network driver for virtio.  It can be used with
 	  lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.