From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Apr 2016 19:32:44 +0000 (-0700)
Subject: Merge tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=183c948a3cb3efbf45eabed41fa7ee04c19378fc;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'tty-4.6-rc3' of git://git./linux/kernel/git/gregkh/tty

Pull tty fixes from Greg KH:
 "Here are two tty fixes for issues found.

  One was due to a merge error in 4.6-rc1, and the other a regression
  fix for UML consoles that broke in 4.6-rc1.

  Both have been in linux-next for a while"

* tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: Fix merge of "tty: Refactor tty_open()"
  tty: Fix UML console breakage
---

183c948a3cb3efbf45eabed41fa7ee04c19378fc