diff --git a/[refs] b/[refs]
index 7686c4f36279..2131669220f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83aceb5b6a561c7fd7cc2d481fb55a0a2ae37c12
+refs/heads/master: a137ce8536f6124c42ac300be01b9b611c7db5a1
diff --git a/trunk/drivers/serial/mux.c b/trunk/drivers/serial/mux.c
index 36e3bcb1ebf0..7633132a10aa 100644
--- a/trunk/drivers/serial/mux.c
+++ b/trunk/drivers/serial/mux.c
@@ -477,6 +477,13 @@ static int __init mux_probe(struct parisc_device *dev)
 		port->ops	= &mux_pops;
 		port->flags	= UPF_BOOT_AUTOCONF;
 		port->line	= port_cnt;
+
+		/* The port->timeout needs to match what is present in
+		 * uart_wait_until_sent in serial_core.c.  Otherwise
+		 * the time spent in msleep_interruptable will be very
+		 * long, causing the appearance of a console hang.
+		 */
+		port->timeout   = HZ / 50;
 		spin_lock_init(&port->lock);
 		status = uart_add_one_port(&mux_driver, port);
 		BUG_ON(status);