Merge remote-tracking branch 'lsk/v3.10/topic/arm64-ptrace' into arm64-v3.10
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 20:29:40 +0000 (21:29 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 20:29:40 +0000 (21:29 +0100)

Trivial merge