Merge 4.0-rc3 into tty-testing
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Mar 2015 06:08:37 +0000 (07:08 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Mar 2015 06:08:37 +0000 (07:08 +0100)
commitbecba85f0e1ca8ab97bd7e836a7129a94ace1ff2
tree3a43cb5edc60310c89790ab0961f5276bd9ca615
parent9eccca0843205f87c00404b663188b88eb248051
parent3372ec28622083ac87daf18918a222fbee06f6f9
Merge 4.0-rc3 into tty-testing

This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_core.c
drivers/tty/serial/8250/8250_dw.c
drivers/tty/serial/8250/8250_pci.c
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/sprd_serial.c
include/linux/serial_core.h
kernel/printk/printk.c