Merge branch 'tmio' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Tue, 20 Jan 2015 09:44:08 +0000 (10:44 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 20 Jan 2015 09:44:08 +0000 (10:44 +0100)

Trivial merge