From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 May 2010 19:21:44 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
X-Git-Tag: firefly_0821_release~9833^2~2168
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bf6239eb84e6d7331f168cd3593958b656ce42a3;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  serial: imx.c: fix CTS trigger level lower to avoid lost chars
  tty: Fix unbalanced BKL handling in error path
  serial: mpc52xx_uart: fix null pointer dereference
---

bf6239eb84e6d7331f168cd3593958b656ce42a3