Merge "arch: arm: Fix the cache routines"