Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsk

author Mark Brown <broonie@linaro.org>

Fri, 13 Jun 2014 20:51:19 +0000 (21:51 +0100)

committer Mark Brown <broonie@linaro.org>

Fri, 13 Jun 2014 20:51:19 +0000 (21:51 +0100)
author Mark Brown <broonie@linaro.org>
Fri, 13 Jun 2014 20:51:19 +0000 (21:51 +0100)
committer Mark Brown <broonie@linaro.org>
Fri, 13 Jun 2014 20:51:19 +0000 (21:51 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-highbank/highbank.c
Simple merge
diff --cc drivers/cpufreq/highbank-cpufreq.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Fri, 13 Jun 2014 20:51:19 +0000 (21:51 +0100)
committer	Mark Brown <broonie@linaro.org>
	Fri, 13 Jun 2014 20:51:19 +0000 (21:51 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-highbank/highbank.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/highbank-cpufreq.c	patch \|	diff1 \|	diff2 \|	blob \| history