diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 23:36:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 23:36:46 -0500 |
| commit | 3b9abc7e48561b0b140ee267e190bc1031f82ff3 (patch) | |
| tree | ec5d8174f89cb8555c74eb3eb770054aa22fc724 /MAINTAINERS | |
| parent | 0cda56962b883cd5e7aa036350e5a0283a88c590 (diff) | |
| parent | 0c73c08ec73dbe080b9ec56696ee21d32754d918 (diff) | |
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
TTY: ldisc, wait for ldisc infinitely in hangup
TTY: ldisc, move wait idle to caller
TTY: ldisc, allow waiting for ldisc arbitrarily long
Revert "tty/serial: Prevent drop of DCD on suspend for Tegra UARTs"
RS485: fix inconsistencies in the meaning of some variables
pch_uart: Fix DMA resource leak issue
serial,mfd: Fix CMSPAR setup
tty/serial: Prevent drop of DCD on suspend for Tegra UARTs
pch_uart: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
pch_uart: Support new device LAPIS Semiconductor ML7831 IOH
pch_uart: Fix hw-flow control issue
tty: hvc_dcc: Fix duplicate character inputs
jsm: Change maintainership
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 165205be20fc..3523ab000f1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3728,7 +3728,7 @@ F: fs/jbd2/ | |||
| 3728 | F: include/linux/jbd2.h | 3728 | F: include/linux/jbd2.h |
| 3729 | 3729 | ||
| 3730 | JSM Neo PCI based serial card | 3730 | JSM Neo PCI based serial card |
| 3731 | M: Breno Leitao <leitao@linux.vnet.ibm.com> | 3731 | M: Lucas Tavares <lucaskt@linux.vnet.ibm.com> |
| 3732 | L: linux-serial@vger.kernel.org | 3732 | L: linux-serial@vger.kernel.org |
| 3733 | S: Maintained | 3733 | S: Maintained |
| 3734 | F: drivers/tty/serial/jsm/ | 3734 | F: drivers/tty/serial/jsm/ |