Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 May 2010 19:21:44 +0000 (12:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 May 2010 19:21:44 +0000 (12:21 -0700)
commitbf6239eb84e6d7331f168cd3593958b656ce42a3
tree9f123cdc8f4616dadec022fb3c03222feab2a9a9
parent4462dc02842698f173f518c1f5ce79c0fb89395a
parent1c5250d6163dac28be3afabdfb6c723f107051b7
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