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)
* 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


Trivial merge