Merge tag 'at91-fixes2' of git://github.com/at91linux/linux-at91 into fixes