Merge branch 'lsk-3.10-gator-5.21' into lsk-3.10-gator
authorJon Medhurst <tixy@linaro.org>
Mon, 11 May 2015 14:07:45 +0000 (15:07 +0100)
committerJon Medhurst <tixy@linaro.org>
Mon, 11 May 2015 14:07:45 +0000 (15:07 +0100)

Trivial merge