Makefile: remove armv7-a flags
Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>
Fix merge errors
this commit fixes:

arch/arm/include/asm/cacheflush.h
arch/arm/kernel/traps.c
arch/arm/mm/cache-v7.S

Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>