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