• Linus Torvalds's avatar
    Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 56b85f32
    Linus Torvalds authored
    * '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).
    56b85f32
omap-serial.c 35.6 KB