Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 9e43e39dc35c..d0a6dc53213c 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -191,7 +191,7 @@ config MOXA_INTELLIO
           module will be called moxa.
 
 config MOXA_SMARTIO
-        tristate "Moxa SmartIO support"
+        tristate "Moxa SmartIO support (OBSOLETE)"
         depends on SERIAL_NONSTANDARD
         help
           Say Y here if you have a Moxa SmartIO multiport serial card.
@@ -202,7 +202,7 @@ config MOXA_SMARTIO
           here.
 
 config MOXA_SMARTIO_NEW
-        tristate "Moxa SmartIO support v. 2.0 (EXPERIMENTAL)"
+        tristate "Moxa SmartIO support v. 2.0"
         depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
         help
           Say Y here if you have a Moxa SmartIO multiport serial card and/or
@@ -610,6 +610,13 @@ config HVC_RTAS
         help
           IBM Console device driver which makes use of RTAS
 
+config HVC_BEAT
+        bool "Toshiba's Beat Hypervisor Console support"
+        depends on PPC_CELLEB
+        select HVC_DRIVER
+        help
+          Toshiba's Cell Reference Set Beat Console device driver
+
 config HVCS
         tristate "IBM Hypervisor Virtual Console Server support"
         depends on PPC_PSERIES