Conflicts: arch/arm/include/asm/elf.h arch/arm/kernel/module.c
Attach a file by drag & drop or click to upload