---

yaml --- r: 325765 b: refs/heads/master c: 5de6934 h: refs/heads/master i: 325763: 28aa6f9 v: v3
git-mirror · Sep 18, 2012 · d4df2fd · d4df2fd
1 parent a67f0f4
commit d4df2fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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.