Merge 3.10-rc5 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2013 04:23:33 +0000 (21:23 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2013 04:23:33 +0000 (21:23 -0700)
1  2 
MAINTAINERS
arch/parisc/kernel/setup.c
drivers/tty/serial/imx.c
drivers/tty/serial/samsung.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge