Merge remote-tracking branch 'tip/auto-latest'

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

Thu, 11 Feb 2016 02:04:12 +0000 (13:04 +1100)

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

Thu, 11 Feb 2016 02:04:12 +0000 (13:04 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 02:04:12 +0000 (13:04 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 02:04:12 +0000 (13:04 +1100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm64/kernel/setup.c
Simple merge
diff --cc arch/mips/Kconfig
Simple merge
diff --cc kernel/memremap.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Feb 2016 02:04:12 +0000 (13:04 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Feb 2016 02:04:12 +0000 (13:04 +1100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/memremap.c	patch \|	diff1 \|	diff2 \|	blob \| history