From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jun 2009 19:03:43 +0000 (-0700)
Subject: Merge branch 'serial'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=15bdb5652689d51cc0316de61774d2732472d9e1;p=linux-beck.git

Merge branch 'serial'

* serial:
  imx: Check for NULL pointer deref before calling tty_encode_baud_rate
  atmel_serial: fix hang in set_termios when crtscts is enabled
  MAINTAINERS: update 8250 section, give Alan Cox a name
  tty: fix sanity check
  pty: Narrow the race on ldisc locking
  tty: fix unused warning when TCGETX is not defined
  ldisc: debug aids
  ldisc: Make sure the ldisc isn't active when we close it
  tty: Fix leaks introduced by the shift to separate ldisc objects

Fix conflicts in drivers/char/pty.c due to earlier version of the ldisc
race narrowing.
---

15bdb5652689d51cc0316de61774d2732472d9e1