On 10 April 2014 16:07, Jon Medhurst (Tixy) tixy@linaro.org wrote:
ARM have released a new version of DS-5 and I have a pull request below to update the version of gator in LSK. Note, the last time gator was pulled into LSK it got done as a rebase rather than a merge commit so the conflict resolution will look messy. Basically, after the merge the contents of drivers/gator/ and tools/gator/daemon/ should be identical to my lsk-3.10-gator branch. (When I tried merging with "-X theirs", it didn't seem to quite work, so watch out for that.)
Pulled now, thanks - it's only been pushed out to the test CI thus far. git diff looks OK to me.