From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Apr 2012 18:40:43 +0000 (-0700)
Subject: Merge tag 'tty-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v3.4-rc4~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a5374303923a543ff3e5f491030b21836d288f5;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge tag 'tty-3.4-rc4' of git://git./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
---

3a5374303923a543ff3e5f491030b21836d288f5