tree 9548c5a4851b1a1e832b7800baf1e72b33bc7a66
parent 435a5aebf609624bdf7c5a9a7705c260d0076195
parent a5880a9e5bb40fbae55de60051d69a29091053c3
author Linus Torvalds <torvalds@linux-foundation.org> 1291323496 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1291323496 -0800

Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  serial: mfd: adjust the baud rate setting
  TTY: open/hangup race fixup
  TTY: don't allow reopen when ldisc is changing
  NET: wan/x25, fix ldisc->open retval
  TTY: ldisc, fix open flag handling
  serial8250: Mark console as CON_ANYTIME