Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
* '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 ...
Showing
- arch/frv/kernel/setup.c 0 additions, 1 deletionarch/frv/kernel/setup.c
- arch/ia64/kernel/setup.c 0 additions, 1 deletionarch/ia64/kernel/setup.c
- arch/mips/cobalt/setup.c 0 additions, 1 deletionarch/mips/cobalt/setup.c
- arch/mips/lasat/setup.c 0 additions, 1 deletionarch/mips/lasat/setup.c
- drivers/char/pcmcia/synclink_cs.c 0 additions, 1 deletiondrivers/char/pcmcia/synclink_cs.c
- drivers/char/synclink.c 0 additions, 1 deletiondrivers/char/synclink.c
- drivers/serial/8250.c 22 additions, 13 deletionsdrivers/serial/8250.c
- drivers/serial/8250_pci.c 4 additions, 0 deletionsdrivers/serial/8250_pci.c
- drivers/serial/8250_pnp.c 13 additions, 0 deletionsdrivers/serial/8250_pnp.c
- drivers/serial/m32r_sio.c 2 additions, 3 deletionsdrivers/serial/m32r_sio.c
- drivers/serial/serial_core.c 12 additions, 6 deletionsdrivers/serial/serial_core.c
- drivers/serial/serial_cs.c 215 additions, 77 deletionsdrivers/serial/serial_cs.c
- drivers/serial/serial_txx9.c 0 additions, 2 deletionsdrivers/serial/serial_txx9.c
- include/linux/serial_core.h 2 additions, 1 deletioninclude/linux/serial_core.h
Loading
Please register or sign in to comment