diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 17:10:25 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 17:10:25 +1100 |
| commit | e768a07c7cd30cb478a5d5e9d7f46afc5644657b (patch) | |
| tree | 3873ec12af16446f48be815143230b592eb4619f /MAINTAINERS | |
| parent | 84ecf99eb8b1f8f2beb7f1df4205352bef3ad1a1 (diff) | |
| parent | c976cc3aa99e813084fc4bd295c9f7b706738b48 (diff) | |
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0bdf6bdab69f..bce3ab69503d 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) @@ -2823,7 +2833,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> @@ -3444,7 +3454,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> @@ -6117,7 +6127,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 |