]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
projects / mv-sheeva.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b477958 0f66e50)
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)
* '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/

1  2 
drivers/char/virtio_console.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/virtio_console.c
Simple merge
Linux for Marvell Sheeva based platforms