Commit 56b85f32d530d09d6805488ad00775d4e0e3baab
Exists in
master
and in
4 other branches
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: (36 commits) serial: apbuart: Fixup apbuart_console_init() TTY: Add tty ioctl to figure device node of the system console. tty: add 'active' sysfs attribute to tty0 and console device drivers: serial: apbuart: Handle OF failures gracefully Serial: Avoid unbalanced IRQ wake disable during resume tty: fix typos/errors in tty_driver.h comments pch_uart : fix warnings for 64bit compile 8250: fix uninitialized FIFOs ip2: fix compiler warning on ip2main_pci_tbl specialix: fix compiler warning on specialix_pci_tbl rocket: fix compiler warning on rocket_pci_ids 8250: add a UPIO_DWAPB32 for 32 bit accesses 8250: use container_of() instead of casting serial: omap-serial: Add support for kernel debugger serial: fix pch_uart kconfig & build drivers: char: hvc: add arm JTAG DCC console support RS485 documentation: add 16C950 UART description serial: ifx6x60: fix memory leak serial: ifx6x60: free IRQ on error Serial: EG20T: add PCH_UART driver ... Fixed up conflicts in drivers/serial/apbuart.c with evil merge that makes the code look fairly sane (unlike either side).
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 45 changed files Side-by-side Diff
- Documentation/ABI/testing/sysfs-tty
- Documentation/filesystems/proc.txt
- Documentation/serial/00-INDEX
- Documentation/serial/serial-rs485.txt
- arch/alpha/include/asm/ioctls.h
- arch/mips/include/asm/ioctls.h
- arch/parisc/include/asm/ioctls.h
- arch/parisc/kernel/pdc_cons.c
- arch/powerpc/include/asm/ioctls.h
- arch/sh/include/asm/ioctls.h
- arch/sparc/include/asm/ioctls.h
- arch/xtensa/include/asm/ioctls.h
- drivers/char/Kconfig
- drivers/char/Makefile
- drivers/char/hvc_dcc.c
- drivers/char/ip2/ip2main.c
- drivers/char/rocket.c
- drivers/char/specialix.c
- drivers/serial/8250.c
- drivers/serial/8250_pci.c
- drivers/serial/Kconfig
- drivers/serial/Makefile
- drivers/serial/apbuart.c
- drivers/serial/cpm_uart/cpm_uart.h
- drivers/serial/cpm_uart/cpm_uart_core.c
- drivers/serial/ifx6x60.c
- drivers/serial/ifx6x60.h
- drivers/serial/mpc52xx_uart.c
- drivers/serial/omap-serial.c
- drivers/serial/pch_uart.c
- drivers/serial/serial_core.c
- drivers/serial/vt8500_serial.c
- drivers/tty/n_gsm.c
- drivers/tty/tty_io.c
- drivers/tty/vt/vt.c
- drivers/video/xen-fbfront.c
- fs/compat_ioctl.c
- fs/proc/Makefile
- fs/proc/proc_console.c
- include/asm-generic/ioctls.h
- include/linux/console.h
- include/linux/serial_core.h
- include/linux/spi/ifx_modem.h
- include/linux/tty_driver.h
- kernel/printk.c