Merge commit 'v3.1' into devicetree/next

This commit is contained in:
Grant Likely 2011-10-24 17:03:35 +02:00
commit 2bf6f675fa
153 changed files with 948 additions and 596 deletions

View file

@ -478,8 +478,10 @@ lqasc_set_termios(struct uart_port *port,
spin_unlock_irqrestore(&ltq_asc_lock, flags);
/* Don't rewrite B0 */
if (tty_termios_baud_rate(new))
if (tty_termios_baud_rate(new))
tty_termios_encode_baud_rate(new, baud, baud);
uart_update_timeout(port, cflag, baud);
}
static const char*