Merge tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux into fixes