]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Mar 2015 18:54:29 +0000 (11:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Mar 2015 18:54:29 +0000 (11:54 -0700)
Pull tty/serial driver fix from Greg KH:
 "Here's a single 8250 serial driver that fixes a reported deadlock with
  the serial console and the tty driver.

  It's been in linux-next for a while now"

* tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: 8250_dw: Fix deadlock in LCR workaround


Trivial merge