Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
Attach a file by drag & drop or click to upload
