Merge branches 'misc' and 'sa1111-base' into for-linus

author Russell King <rmk+kernel@armlinux.org.uk>

Thu, 6 Oct 2016 07:56:43 +0000 (08:56 +0100)

committer Russell King <rmk+kernel@armlinux.org.uk>

Thu, 6 Oct 2016 07:56:43 +0000 (08:56 +0100)
author Russell King <rmk+kernel@armlinux.org.uk>
Thu, 6 Oct 2016 07:56:43 +0000 (08:56 +0100)
committer Russell King <rmk+kernel@armlinux.org.uk>
Thu, 6 Oct 2016 07:56:43 +0000 (08:56 +0100)
diff --cc arch/arm/Makefile
Simple merge
diff --cc arch/arm/mm/mmu.c
Simple merge
diff --cc include/linux/cpuhotplug.h
Simple merge
author	Russell King <rmk+kernel@armlinux.org.uk>
	Thu, 6 Oct 2016 07:56:43 +0000 (08:56 +0100)
committer	Russell King <rmk+kernel@armlinux.org.uk>
	Thu, 6 Oct 2016 07:56:43 +0000 (08:56 +0100)
		1	2
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/cpuhotplug.h	patch \|	diff1 \|	diff2 \|	blob \| history