Merge pull request #3305 from opalci/skiboot-v6.5-130-g52952aca

skiboot v6.5-130-g52952aca