Skip to content
  • Linus Torvalds's avatar
    Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial · 6f3a28f7
    Linus Torvalds authored
    * 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial: (21 commits)
      [SERIAL] add PNP IDs for FPI based touchscreens
      [SERIAL] Magic SysRq SAK does nothing on serial consoles
      [SERIAL] tickle NMI watchdog on serial output.
      [SERIAL] Fix oops when removing suspended serial port
      [SERIAL] Fix resume handling bug
      [SERIAL] Remove wrong asm/serial.h inclusions
      [SERIAL] CONFIG_PM=n slim: drivers/serial/8250_pci.c
      [SERIAL] OMAP1510 serial fix for 115200 baud
      [SERIAL] returning proper error from serial core driver
      [SERIAL] Make uart_line_info() correctly tell MMIO from I/O port
      [SERIAL] suspend/resume handlers don't have level arg anymore
      [SERIAL] 8250 resourse management fixes
      [SERIAL] serial_cs: Add quirk for brainboxes 2-port RS232 card
      [SERIAL] serial_cs: handle Nokia multi->single port bodge via config quirk
      [SERIAL] serial_cs: add configuration quirk
      [SERIAL] serial_cs: Convert Oxford 950 / Possio GCC wakeup quirk
      [SERIAL] serial_cs: convert IBM post-init handling to a quirk
      [SERIAL] serial_cs: allow wildcarded quirks
      [SERIAL] serial_cs: convert multi-port table to quirk table
      [SERIAL] serial_cs: Use clean up multiport card detection
      ...
    6f3a28f7