From d4df2fd6c26a01d549ddc944338c90b1216b43af Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 18 Sep 2012 17:17:56 +0100
Subject: [PATCH] --- yaml --- r: 325765 b: refs/heads/master c:
 5de69349ed4c10f43fa6dc6617051d94eee04e6c h: refs/heads/master i:   325763:
 28aa6f9257daf3acf102ddeb5058fd9e53d6902b v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/tty/Kconfig        | 2 +-
 trunk/drivers/tty/serial/Kconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7c1299e09511..436f15a5c21b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b77562b4f867e4bc0c6effb7dfe3255fc265ad0
+refs/heads/master: 5de69349ed4c10f43fa6dc6617051d94eee04e6c
diff --git a/trunk/drivers/tty/Kconfig b/trunk/drivers/tty/Kconfig
index b46c4301b651..d8e05eeab232 100644
--- a/trunk/drivers/tty/Kconfig
+++ b/trunk/drivers/tty/Kconfig
@@ -316,7 +316,7 @@ config N_HDLC
 	  here.
 
 config N_GSM
-	tristate "GSM MUX line discipline support"
+	tristate "GSM MUX line discipline support (EXPERIMENTAL)"
 	depends on NET
 	help
 	  This line discipline provides support for the GSM MUX protocol and
diff --git a/trunk/drivers/tty/serial/Kconfig b/trunk/drivers/tty/serial/Kconfig
index 84c6f374f1fe..2a9659dfb74c 100644
--- a/trunk/drivers/tty/serial/Kconfig
+++ b/trunk/drivers/tty/serial/Kconfig
@@ -1303,7 +1303,7 @@ config SERIAL_ALTERA_UART_CONSOLE
 	  Enable a Altera UART port to be the system console.
 
 config SERIAL_IFX6X60
-        tristate "SPI protocol driver for Infineon 6x60 modem"
+        tristate "SPI protocol driver for Infineon 6x60 modem (EXPERIMENTAL)"
 	depends on GPIOLIB && SPI
 	help
 	  Support for the IFX6x60 modem devices on Intel MID platforms.