Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Sep 2010 23:44:24 +0000 (16:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Sep 2010 23:44:24 +0000 (16:44 -0700)
commit36ff4a5517779355f4bd62030cdb8498c3954f29
treeb7afaeef8b3eca3ddf3ebfc99b2562e850d52582
parented1cde68365c1251b920900c51e73675ff38dc66
parente3671ac429fe50cf0c1b4f1dc4b7237207f1d956
Merge git://git./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