]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
* 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


Trivial merge