From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 May 2012 20:47:49 +0000 (-0700)
Subject: Merge tag 'tty-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: firefly_0821_release~3680^2~2964
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c89ff23960f3e0b72f593a48c808c25f9e7f5a93;p=firefly-linux-kernel-4.4.55.git

Merge tag 'tty-3.4-rc6' of git://git./linux/kernel/git/gregkh/tty

Pull a TTY fix from Greg Kroah-Hartman:
 "This is a deadlock bugfix that was easy to hit, and that the vt layer
  lock rework got wrong, so it reverts the logic back to the way it was
  in 3.3 and earlier kernels to prevent problems."

* tag 'tty-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  vt: Fix deadlock on scroll-lock
---

c89ff23960f3e0b72f593a48c808c25f9e7f5a93