Merge branches 'at91-fixes' and 'pxa-fixes'