From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Feb 2011 20:19:58 +0000 (-0800)
Subject: Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v3.0~1857
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce86d35d2fd119d777fc72736732c8c9c3456698;p=platform%2Fkernel%2Flinux-amlogic.git

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/
---

ce86d35d2fd119d777fc72736732c8c9c3456698