diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 15:11:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 15:11:04 -0700 |
| commit | e6bee325e49f17c65c1fd66e9e8b348c85788341 (patch) | |
| tree | bcc9e5d8e82efa9009edd481a837cc3626360091 /MAINTAINERS | |
| parent | a5e6b135bdff649e4330f98e2e80dbb1984f7e77 (diff) | |
| parent | 6ae705b23be8da52d3163be9d81e9b767876aaf9 (diff) | |
| download | linux-3.10-e6bee325e49f17c65c1fd66e9e8b348c85788341.tar.gz linux-3.10-e6bee325e49f17c65c1fd66e9e8b348c85788341.tar.bz2 linux-3.10-e6bee325e49f17c65c1fd66e9e8b348c85788341.zip | |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
pch_uart: reference clock on CM-iTC
pch_phub: add new device ML7213
n_gsm: fix UIH control byte : P bit should be 0
n_gsm: add a documentation
serial: msm_serial_hs: Add MSM high speed UART driver
tty_audit: fix tty_audit_add_data live lock on audit disabled
tty: move cd1865.h to drivers/staging/tty/
Staging: tty: fix build with epca.c driver
pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
Staging: generic_serial: fix double locking bug
nozomi: don't use flush_scheduled_work()
tty/serial: Relax the device_type restriction from of_serial
MAINTAINERS: Update HVC file patterns
tty: phase out of ioctl file pointer for tty3270 as well
tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
pch_uart: Fix DMA channel miss-setting issue.
pch_uart: fix exclusive access issue
pch_uart: fix auto flow control miss-setting issue
pch_uart: fix uart clock setting issue
pch_uart : Use dev_xxx not pr_xxx
...
Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2a2cddd2f88..b7c4000672f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -465,6 +465,16 @@ M: Matt Turner <mattst88@gmail.com> L: linux-alpha@vger.kernel.org F: arch/alpha/ +ALTERA UART/JTAG UART SERIAL DRIVERS +M: Tobias Klauser <tklauser@distanz.ch> +L: linux-serial@vger.kernel.org +L: nios2-dev@sopc.et.ntust.edu.tw (moderated for non-subscribers) +S: Maintained +F: drivers/tty/serial/altera_uart.c +F: drivers/tty/serial/altera_jtaguart.c +F: include/linux/altera_uart.h +F: include/linux/altera_jtaguart.h + AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER M: Thomas Dahlmann <dahlmann.thomas@arcor.de> L: linux-geode@lists.infradead.org (moderated for non-subscribers) @@ -2833,7 +2843,7 @@ F: mm/hwpoison-inject.c HYPERVISOR VIRTUAL CONSOLE DRIVER L: linuxppc-dev@lists.ozlabs.org S: Odd Fixes -F: drivers/char/hvc_* +F: drivers/tty/hvc/ iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER M: Peter Jones <pjones@redhat.com> @@ -3448,7 +3458,7 @@ M: Jiri Kosina <jkosina@suse.cz> M: David Sterba <dsterba@suse.cz> S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git -F: drivers/char/pcmcia/ipwireless/ +F: drivers/tty/ipwireless/ IPX NETWORK LAYER M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> @@ -6102,7 +6112,7 @@ M: Chris Metcalf <cmetcalf@tilera.com> W: http://www.tilera.com/scm/ S: Supported F: arch/tile/ -F: drivers/char/hvc_tile.c +F: drivers/tty/hvc/hvc_tile.c F: drivers/net/tile/ TLAN NETWORK DRIVER |