Merge with ARM SMP tree