Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Dec 2009 18:40:51 +0000 (10:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Dec 2009 18:40:51 +0000 (10:40 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty/of_serial: add missing ns16550a id
  bcm63xx_uart: Fix serial driver compile breakage.
  tty_port: handle the nonblocking open of a dead port corner case


Trivial merge