From 68bdfb8459a12aa144c47191ca6a0eaf1191aeae Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Tue, 2 Oct 2012 11:16:42 -0700
Subject: [PATCH] --- yaml --- r: 353515 b: refs/heads/master c:
 510cf5a6d21e2fe03d63b5e6c95c60ceb7ea933c h: refs/heads/master i:   353513:
 5a3b2c71c3a6c142a198d7b94430330c965e86a9   353511:
 cd11046102756878a2780e537e4df5c8975c3628 v: v3

---
 [refs]                  | 2 +-
 trunk/arch/s390/Kconfig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2abd4bd678b7..5d46b120dc6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec87905930e44960cfb9f344e40d40427bb5075b
+refs/heads/master: 510cf5a6d21e2fe03d63b5e6c95c60ceb7ea933c
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index b5ea38c25647..76e73158bcad 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -718,8 +718,8 @@ source "arch/s390/kvm/Kconfig"
 
 config S390_GUEST
 	def_bool y
-	prompt "s390 support for virtio devices (EXPERIMENTAL)"
-	depends on 64BIT && EXPERIMENTAL
+	prompt "s390 support for virtio devices"
+	depends on 64BIT
 	select VIRTUALIZATION
 	select VIRTIO
 	select VIRTIO_CONSOLE