Merge remote-tracking branch 'char-misc/char-misc-next'

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

Tue, 13 Sep 2016 02:49:15 +0000 (12:49 +1000)

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

Tue, 13 Sep 2016 02:49:15 +0000 (12:49 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 02:49:15 +0000 (12:49 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 02:49:15 +0000 (12:49 +1000)
diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/tty/serial/pch_uart.c
Simple merge
diff --cc include/linux/hyperv.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2016 02:49:15 +0000 (12:49 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2016 02:49:15 +0000 (12:49 +1000)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/pch_uart.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/hyperv.h	patch \|	diff1 \|	diff2 \|	blob \| history