Merge branches 'misc' and 'misc-rc6' into for-linus

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

Tue, 5 Jan 2016 11:07:28 +0000 (11:07 +0000)

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

Tue, 5 Jan 2016 11:07:28 +0000 (11:07 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 5 Jan 2016 11:07:28 +0000 (11:07 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 5 Jan 2016 11:07:28 +0000 (11:07 +0000)
diff --cc Documentation/devicetree/bindings/arm/l2c2x0.txt
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mm/proc-v7.S
Simple merge
diff --cc arch/arm64/Kconfig
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 5 Jan 2016 11:07:28 +0000 (11:07 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 5 Jan 2016 11:07:28 +0000 (11:07 +0000)
		1	2
Documentation/devicetree/bindings/arm/l2c2x0.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/proc-v7.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history