Merge remote-tracking branch 'lsk/v3.10/topic/arm64-ftrace' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Tue, 24 Jun 2014 11:44:37 +0000 (12:44 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 24 Jun 2014 11:44:37 +0000 (12:44 +0100)

Trivial merge