Linux 3.4.77

Conflicts:
	arch/arm/kernel/traps.c
	drivers/net/ethernet/broadcom/tg3.c
Fix up Linux 3.4.77 merge error