From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Sep 2010 23:44:24 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
X-Git-Tag: v2.6.36-rc5~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=36ff4a5517779355f4bd62030cdb8498c3954f29;p=~emulex%2Finfiniband.git

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: mfd: fix bug in serial_hsu_remove()
  serial: amba-pl010: fix set_ldisc
---

36ff4a5517779355f4bd62030cdb8498c3954f29