diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-02 13:47:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-02 13:47:49 -0700 |
| commit | c89ff23960f3e0b72f593a48c808c25f9e7f5a93 (patch) | |
| tree | 42d3a1ce13f59eec365a1a0b1a596ef50c78641c /scripts/docproc.c | |
| parent | 529acf58981440eefeaf1451387e2a0aa4825c12 (diff) | |
| parent | 84f904ecd3aa2ccb5779b815b69c1cb592f07bb5 (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
Diffstat (limited to 'scripts/docproc.c')
0 files changed, 0 insertions, 0 deletions