Merge branch 'late/kirkwood' into late/soc