Merge branch 'gianfar-ls1021a-ptp'