tree b7afaeef8b3eca3ddf3ebfc99b2562e850d52582
parent ed1cde68365c1251b920900c51e73675ff38dc66
parent e3671ac429fe50cf0c1b4f1dc4b7237207f1d956
author Linus Torvalds <torvalds@linux-foundation.org> 1285026264 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1285026264 -0700

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