Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

Browse source

* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty: update MAINTAINERS file due to driver movement
  tty: move drivers/serial/ to drivers/tty/serial/
  tty: move hvc drivers to drivers/tty/hvc/

...

This commit is contained in:

Linus Torvalds 2011-01-20 16:39:23 -08:00

parent 466c19063b df6212529c

commit fc887b15d9

274 changed files with 105889 additions and 105888 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

3

drivers/Makefile

View file

2

drivers/char/Kconfig

View file

13

drivers/char/Makefile

View file

2

drivers/tty/Makefile

View file

13

drivers/tty/hvc/Makefile

View file

0

drivers/char/hvc_beat.c → drivers/tty/hvc/hvc_beat.c

View file

0

drivers/char/hvc_console.c → drivers/tty/hvc/hvc_console.c

View file

0

drivers/char/hvc_console.h → drivers/tty/hvc/hvc_console.h

View file

0

drivers/char/hvc_dcc.c → drivers/tty/hvc/hvc_dcc.c

View file

0

drivers/char/hvc_irq.c → drivers/tty/hvc/hvc_irq.c

View file

0

drivers/char/hvc_iseries.c → drivers/tty/hvc/hvc_iseries.c

View file

0

drivers/char/hvc_iucv.c → drivers/tty/hvc/hvc_iucv.c

View file

0

drivers/char/hvc_rtas.c → drivers/tty/hvc/hvc_rtas.c

View file

0

drivers/char/hvc_tile.c → drivers/tty/hvc/hvc_tile.c

View file

0

drivers/char/hvc_udbg.c → drivers/tty/hvc/hvc_udbg.c

View file

0

drivers/char/hvc_vio.c → drivers/tty/hvc/hvc_vio.c

View file

0

drivers/char/hvc_xen.c → drivers/tty/hvc/hvc_xen.c

View file

0

drivers/char/hvcs.c → drivers/tty/hvc/hvcs.c

View file

0

drivers/char/hvsi.c → drivers/tty/hvc/hvsi.c

View file

0

drivers/char/virtio_console.c → drivers/tty/hvc/virtio_console.c

View file

0

drivers/serial/21285.c → drivers/tty/serial/21285.c

View file

0

drivers/serial/68328serial.c → drivers/tty/serial/68328serial.c

View file

0

drivers/serial/68328serial.h → drivers/tty/serial/68328serial.h

View file

0

drivers/serial/68360serial.c → drivers/tty/serial/68360serial.c

View file

0

drivers/serial/8250.c → drivers/tty/serial/8250.c

View file

0

drivers/serial/8250.h → drivers/tty/serial/8250.h

View file

0

drivers/serial/8250_accent.c → drivers/tty/serial/8250_accent.c

View file

0

drivers/serial/8250_acorn.c → drivers/tty/serial/8250_acorn.c

View file

0

drivers/serial/8250_boca.c → drivers/tty/serial/8250_boca.c

View file

0

drivers/serial/8250_early.c → drivers/tty/serial/8250_early.c

View file

0

drivers/serial/8250_exar_st16c554.c → drivers/tty/serial/8250_exar_st16c554.c

View file

0

drivers/serial/8250_fourport.c → drivers/tty/serial/8250_fourport.c

View file

0

drivers/serial/8250_gsc.c → drivers/tty/serial/8250_gsc.c

View file

0

drivers/serial/8250_hp300.c → drivers/tty/serial/8250_hp300.c

View file

0

drivers/serial/8250_hub6.c → drivers/tty/serial/8250_hub6.c

View file

0

drivers/serial/8250_mca.c → drivers/tty/serial/8250_mca.c

View file

0

drivers/serial/8250_pci.c → drivers/tty/serial/8250_pci.c

View file

0

drivers/serial/8250_pnp.c → drivers/tty/serial/8250_pnp.c

View file

0

drivers/serial/Kconfig → drivers/tty/serial/Kconfig

View file

0

drivers/serial/Makefile → drivers/tty/serial/Makefile

View file

0

drivers/serial/altera_jtaguart.c → drivers/tty/serial/altera_jtaguart.c

View file

0

drivers/serial/altera_uart.c → drivers/tty/serial/altera_uart.c

View file

0

drivers/serial/amba-pl010.c → drivers/tty/serial/amba-pl010.c

View file

0

drivers/serial/amba-pl011.c → drivers/tty/serial/amba-pl011.c

View file

0

drivers/serial/apbuart.c → drivers/tty/serial/apbuart.c

View file

0

drivers/serial/apbuart.h → drivers/tty/serial/apbuart.h

View file

0

drivers/serial/atmel_serial.c → drivers/tty/serial/atmel_serial.c

View file

0

drivers/serial/bcm63xx_uart.c → drivers/tty/serial/bcm63xx_uart.c

View file

0

drivers/serial/bfin_5xx.c → drivers/tty/serial/bfin_5xx.c

View file

0

drivers/serial/bfin_sport_uart.c → drivers/tty/serial/bfin_sport_uart.c

View file

0

drivers/serial/bfin_sport_uart.h → drivers/tty/serial/bfin_sport_uart.h

View file

0

drivers/serial/clps711x.c → drivers/tty/serial/clps711x.c

View file

0

drivers/serial/cpm_uart/Makefile → drivers/tty/serial/cpm_uart/Makefile

View file

0

drivers/serial/cpm_uart/cpm_uart.h → drivers/tty/serial/cpm_uart/cpm_uart.h

View file

0

drivers/serial/cpm_uart/cpm_uart_core.c → drivers/tty/serial/cpm_uart/cpm_uart_core.c

View file

0

drivers/serial/cpm_uart/cpm_uart_cpm1.c → drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c

View file

0

drivers/serial/cpm_uart/cpm_uart_cpm1.h → drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h

View file

0

drivers/serial/cpm_uart/cpm_uart_cpm2.c → drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c

View file

0

drivers/serial/cpm_uart/cpm_uart_cpm2.h → drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h

View file

0

drivers/serial/crisv10.c → drivers/tty/serial/crisv10.c

View file

0

drivers/serial/crisv10.h → drivers/tty/serial/crisv10.h

View file

0

drivers/serial/dz.c → drivers/tty/serial/dz.c

View file

0

drivers/serial/dz.h → drivers/tty/serial/dz.h

View file

0

drivers/serial/icom.c → drivers/tty/serial/icom.c

View file

0

drivers/serial/icom.h → drivers/tty/serial/icom.h

View file

0

drivers/serial/ifx6x60.c → drivers/tty/serial/ifx6x60.c

View file

0

drivers/serial/ifx6x60.h → drivers/tty/serial/ifx6x60.h

View file

0

drivers/serial/imx.c → drivers/tty/serial/imx.c

View file

0

drivers/serial/ioc3_serial.c → drivers/tty/serial/ioc3_serial.c

View file

0

drivers/serial/ioc4_serial.c → drivers/tty/serial/ioc4_serial.c

View file

0

drivers/serial/ip22zilog.c → drivers/tty/serial/ip22zilog.c

View file

0

drivers/serial/ip22zilog.h → drivers/tty/serial/ip22zilog.h

View file

0

drivers/serial/jsm/Makefile → drivers/tty/serial/jsm/Makefile

View file

0

drivers/serial/jsm/jsm.h → drivers/tty/serial/jsm/jsm.h

View file

0

drivers/serial/jsm/jsm_driver.c → drivers/tty/serial/jsm/jsm_driver.c

View file

0

drivers/serial/jsm/jsm_neo.c → drivers/tty/serial/jsm/jsm_neo.c

View file

0

drivers/serial/jsm/jsm_tty.c → drivers/tty/serial/jsm/jsm_tty.c

View file

0

drivers/serial/kgdboc.c → drivers/tty/serial/kgdboc.c

View file

0

drivers/serial/m32r_sio.c → drivers/tty/serial/m32r_sio.c

View file

0

drivers/serial/m32r_sio.h → drivers/tty/serial/m32r_sio.h

View file

0

drivers/serial/m32r_sio_reg.h → drivers/tty/serial/m32r_sio_reg.h

View file

0

drivers/serial/max3100.c → drivers/tty/serial/max3100.c

View file

0

drivers/serial/max3107-aava.c → drivers/tty/serial/max3107-aava.c

View file

0

drivers/serial/max3107.c → drivers/tty/serial/max3107.c

View file

0

drivers/serial/max3107.h → drivers/tty/serial/max3107.h

View file

0

drivers/serial/mcf.c → drivers/tty/serial/mcf.c

View file

0

drivers/serial/mfd.c → drivers/tty/serial/mfd.c

View file

0

drivers/serial/mpc52xx_uart.c → drivers/tty/serial/mpc52xx_uart.c

View file

0

drivers/serial/mpsc.c → drivers/tty/serial/mpsc.c

View file

0

drivers/serial/mrst_max3110.c → drivers/tty/serial/mrst_max3110.c

View file

0

drivers/serial/mrst_max3110.h → drivers/tty/serial/mrst_max3110.h

View file

0

drivers/serial/msm_serial.c → drivers/tty/serial/msm_serial.c

View file

0

drivers/serial/msm_serial.h → drivers/tty/serial/msm_serial.h

View file

0

drivers/serial/mux.c → drivers/tty/serial/mux.c

View file

0

drivers/serial/netx-serial.c → drivers/tty/serial/netx-serial.c

View file

0

drivers/serial/nwpserial.c → drivers/tty/serial/nwpserial.c

View file

0

drivers/serial/of_serial.c → drivers/tty/serial/of_serial.c

View file

0

drivers/serial/omap-serial.c → drivers/tty/serial/omap-serial.c

View file

0

drivers/serial/pch_uart.c → drivers/tty/serial/pch_uart.c

View file

0

drivers/serial/pmac_zilog.c → drivers/tty/serial/pmac_zilog.c

View file

Some files were not shown because too many files have changed in this diff Show more