Fix up Linux 3.4.77 merge error

Conflicts:
	arch/arm/kernel/traps.c