linaro done right

Change-Id: I3f9e58c1acc426661382a3f45bd9e22cd66ded1f