Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Feb 2011 20:19:58 +0000 (12:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Feb 2011 20:19:58 +0000 (12:19 -0800)
commitce86d35d2fd119d777fc72736732c8c9c3456698
tree531b2077d9db6b44285ad75196672b4d102e8f20
parentb477958314796f51c54829dbaea89b1f46dabd06
parent0f66e50af53d39edebf4bc64ef90077e738c171f
Merge branch 'tty-linus' of git://git./linux/kernel/git/gregkh/tty-2.6

* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  serial: bfin_5xx: split uart RX lock from uart port lock to avoid deadlock
  68360serial: Plumb in rs_360_get_icount()
  n_gsm: copy mtu over when configuring via ioctl interface
  virtio: console: Move file back to drivers/char/
drivers/char/virtio_console.c