Merge 3.4-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Apr 2012 16:39:23 +0000 (09:39 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Apr 2012 16:39:23 +0000 (09:39 -0700)
commit10af77c193681398e5dbe830db181d86047fcd41
treeb843eb8dae09a53efb410dd11d2132dba4fe4d15
parent66f75a5d028beaf67c931435fdc3e7823125730c
parent5f1a38952b7e932a1c169c28917b9a831f641bcc
Merge 3.4-rc4 into tty-next

This resolves the merge problem with:
drivers/tty/serial/pch_uart.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/mach-omap2/serial.c
drivers/tty/serial/pch_uart.c