]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4b916c4 1828929)
Merge tag 'tty-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 May 2012 20:47:49 +0000 (13:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 May 2012 20:47:49 +0000 (13:47 -0700)
commit00d03a97afc7f4161994ba45484bb6b8cc9c1154
tree42d3a1ce13f59eec365a1a0b1a596ef50c78641ctree | snapshot
parent4b916c48d8e43dee0969a7c23bafcf3de358ffa2commit | diff
parent182892991e3ebe40679d82122d63ec8b0f6b900fcommit | diff
Merge tag 'tty-3.4-rc6' of git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.