Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa