Merge branch 'psci/for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

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

Fri, 7 Aug 2015 18:58:48 +0000 (19:58 +0100)

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

Mon, 10 Aug 2015 14:57:44 +0000 (15:57 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Fri, 7 Aug 2015 18:58:48 +0000 (19:58 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 10 Aug 2015 14:57:44 +0000 (15:57 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/Makefile
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Fri, 7 Aug 2015 18:58:48 +0000 (19:58 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 10 Aug 2015 14:57:44 +0000 (15:57 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history