Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2010-09-20 16:44:24 -07:00

parent ed1cde6836 e3671ac429

commit 36ff4a5517

2 changed files with 11 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

drivers/serial/amba-pl010.c

View file

17

drivers/serial/mfd.c

View file