tree bdc364ede8c0fba63f0eacdcb7aaf2efcf4f0bca
parent 978b4053aefd422713f289f2a315ce2acba62018
parent d94c7bd4c1361cab58a21d530078c5673863dcc2
author Linus Torvalds <torvalds@linux-foundation.org> 1258558658 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258558658 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty: cp210x: Fix carrier handling
  tty_port: If we are opened non blocking we still need to raise the carrier