Merge "arm: dma-mapping: flush highmem mappings"