This resolves the merge problem with:
	drivers/tty/serial/pch_uart.c
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>