Merge remote-tracking branch 'tty/tty-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 16 May 2014 05:09:53 +0000 (15:09 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 16 May 2014 05:09:53 +0000 (15:09 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 05:09:53 +0000 (15:09 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 05:09:53 +0000 (15:09 +1000)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/arm64/Kconfig
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc drivers/tty/serial/8250/8250_core.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 16 May 2014 05:09:53 +0000 (15:09 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 16 May 2014 05:09:53 +0000 (15:09 +1000)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250/8250_core.c	patch \|	diff1 \|	diff2 \|	blob \| history