Merge tag 'vgic-migrate-for-marc' of git://git.linaro.org/people/christoffer.dall...