[ARM] Merge AT91 and devel branches