Merge branch 'depends/tty-omap-serial' into next/cleanup

This part of the tty tree (unfortunately with all the preceding patches
as well) is a dependency for some of the OMAP cleanups, so we've pulled
it in as a dependency based on agreement with Greg.

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-omap2/serial.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge