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)
This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Trivial merge