Merge branch 'depends/tty-omap-serial' into next/cleanup
authorOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 03:03:42 +0000 (20:03 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 03:04:39 +0000 (20:04 -0700)
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>
1  2 
arch/arm/mach-omap2/serial.c
arch/arm/mach-ux500/board-mop500.c

Simple merge
Simple merge