Merge 3.15-rc3 into tty-next

author Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Mon, 28 Apr 2014 04:40:39 +0000 (21:40 -0700)

committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Mon, 28 Apr 2014 04:40:39 +0000 (21:40 -0700)
author Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Apr 2014 04:40:39 +0000 (21:40 -0700)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Apr 2014 04:40:39 +0000 (21:40 -0700)
diff --cc arch/arm64/Kconfig
Simple merge
diff --cc drivers/tty/serial/8250/8250_core.c
Simple merge
diff --cc drivers/tty/serial/serial_core.c
Simple merge
author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 28 Apr 2014 04:40:39 +0000 (21:40 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 28 Apr 2014 04:40:39 +0000 (21:40 -0700)
		1	2
arch/arm64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250/8250_core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/serial_core.c	patch \|	diff1 \|	diff2 \|	blob \| history