tree fa4ec15fa5a0440eb4e32c83da4ac66dd43f64c4
parent 0d9ccfe1b5321b8d27117817b9ae4d3288c8b015
parent 16173c7c2d79da7eb89b41acfdebd74b130f4339
author Linus Torvalds <torvalds@linux-foundation.org> 1259692851 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1259692851 -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/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