Merge branch 'at91/cleanup' into next/drivers