| commit | bf6239eb84e6d7331f168cd3593958b656ce42a3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 13 12:21:44 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 13 12:21:44 2010 -0700 |
| tree | 9f123cdc8f4616dadec022fb3c03222feab2a9a9 | |
| parent | 4462dc02842698f173f518c1f5ce79c0fb89395a [diff] | |
| parent | 1c5250d6163dac28be3afabdfb6c723f107051b7 [diff] |
Merge git://git.kernel.org/pub/scm/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