Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Nov 2009 15:37:38 +0000 (07:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Nov 2009 15:37:38 +0000 (07:37 -0800)
commit78db1caa8ae4e549ffc0bbf0f9b52c113e9a4da0
treebdc364ede8c0fba63f0eacdcb7aaf2efcf4f0bca
parent978b4053aefd422713f289f2a315ce2acba62018
parentd94c7bd4c1361cab58a21d530078c5673863dcc2
Merge git://git./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