Merge branch 'linux-linaro-lsk-android' of git://git.linaro.org/kernel/linux-linaro...

author Mark Brown <broonie@kernel.org>

Fri, 21 Nov 2014 16:52:20 +0000 (16:52 +0000)

committer Mark Brown <broonie@kernel.org>

Fri, 21 Nov 2014 16:52:20 +0000 (16:52 +0000)
author Mark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 16:52:20 +0000 (16:52 +0000)
committer Mark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 16:52:20 +0000 (16:52 +0000)
diff --cc include/linux/compiler.h
Simple merge
diff --cc kernel/power/process.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 21 Nov 2014 16:52:20 +0000 (16:52 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 21 Nov 2014 16:52:20 +0000 (16:52 +0000)
		1	2
include/linux/compiler.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/power/process.c	patch \|	diff1 \|	diff2 \|	blob \| history