tree 05664edf4a6f10bcb196c9e103eda60e8765334c
parent 1cd653a665b08a3920e320a71b4ac5b80d36953c
parent d3a7b83f865b46bb7b5e1ed18a129ce1af349db4
author Linus Torvalds <torvalds@linux-foundation.org> 1334947243 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1334947243 -0700
mergetag object d3a7b83f865b46bb7b5e1ed18a129ce1af349db4
 type commit
 tag tty-3.4-rc4
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1334941784 -0700
 
 TTY fixes for 3.4-rc4
 
 Here are 3 tiny bugfixes for 3.4-rc4.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iEYEABECAAYFAk+RmIIACgkQMUfUDdst+yl9swCgyW6z7hga+MgBFmZHDISTX6B+
 VcMAniQywDirSgalPRI8ztX3wbgD1IIs
 =eP8N
 -----END PGP SIGNATURE-----

Merge tag 'tty-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull 3 tiny tty bugfixes from Greg Kroah-Hartman.

* tag 'tty-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  drivers/tty/amiserial.c: add missing tty_unlock
  pch_uart: Fix dma channel unallocated issue
  ARM: clps711x: serial driver hungs are a result of call disable_irq within ISR