projects / linux-flexiantxendom0-3.2.10.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 529acf5 84f904e)
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)
commitc89ff23960f3e0b72f593a48c808c25f9e7f5a93
tree42d3a1ce13f59eec365a1a0b1a596ef50c78641ctree | snapshot
parent529acf58981440eefeaf1451387e2a0aa4825c12commit | diff
parent84f904ecd3aa2ccb5779b815b69c1cb592f07bb5commit | diff
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
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)