arch/arm/include/asm/hwcap.h: Fix merge error