Merge branch 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-at91...