Merge bk://bk.arm.linux.org.uk:14691

into home.transmeta.com:/home/torvalds/v2.5/linux

drivers/serial/8250.c

@@ -1707,6 +1707,7 @@ static void __init serial8250_isa_init_ports(void)
 		serial8250_ports[i].port.irq     = irq_cannonicalize(old_serial_port[i].irq);
 		serial8250_ports[i].port.uartclk = old_serial_port[i].base_baud * 16;
 		serial8250_ports[i].port.flags   = old_serial_port[i].flags;
+		serial8250_ports[i].port.hub6    = old_serial_port[i].hub6;
 		serial8250_ports[i].port.ops     = &serial8250_pops;
 	}
 }

drivers/serial/8250.h

@@ -34,6 +34,7 @@ struct old_serial_port {
 	unsigned int port;
 	unsigned int irq;
 	unsigned int flags;
+	unsigned char hub6;
 };
 
 #undef SERIAL_DEBUG_PCI