]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
Merge 3.4-rc3 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Apr 2012 22:57:31 +0000 (15:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Apr 2012 22:57:31 +0000 (15:57 -0700)
commit665ab0f3c8b8f86bb77b25285ac93870c7054d63
treec7d12c3559982eb3fb1847438d4b45ce034851e5
parentbf03f65b7967df5807ddef7b99f8a41d4c94fc70
parente816b57a337ea3b755de72bec38c10c864f23015
Merge 3.4-rc3 into tty-next

This allows us to pick up some changes needed for other serial patches.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250.c
drivers/tty/serial/amba-pl011.c
drivers/tty/serial/omap-serial.c
drivers/tty/serial/pch_uart.c
drivers/tty/vt/vt.c
include/linux/serial_core.h