From: Linus Torvalds Date: Fri, 2 Jan 2009 18:25:51 +0000 (-0800) Subject: Merge branch 'tty-updates' from Alan X-Git-Tag: v2.6.29-rc1~545 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d2fde28ce793c09c1ea36d981cb6765174fd1eea;p=linux-2.6-omap-h63xx.git Merge branch 'tty-updates' from Alan * tty-updates: (75 commits) serial_8250: support for Sealevel Systems Model 7803 COMM+8 hso maintainers update patch hso modem detect fix patch against Alan Cox'es tty tree tty: Fix an ircomm warning and note another bug drivers/char/cyclades.c: cy_pci_probe: fix error path Serial: UART driver changes for Cavium OCTEON. Serial: Allow port type to be specified when calling serial8250_register_port. 8250: Serial driver changes to support future Cavium OCTEON serial patches. 8250: Don't clobber spinlocks. fix for tty-serial-move-port tty: We want the port object to be persistent __FUNCTION__ is gcc-specific, use __func__ serial: RS485 ioctl structure uses __u32 include linux/types.h tty: Drop the lock_kernel in the private ioctl hook synclink_cs: Convert to tty_port tty: use port methods for the rocket driver tty: kref the rocket driver tty: make rocketport use standard port->flags tty: Redo the rocket driver locking tty: Make epca use the port helpers ... --- d2fde28ce793c09c1ea36d981cb6765174fd1eea