Linux 3.4.9

Conflicts:

	arch/arm/kernel/traps.c
	drivers/usb/core/hub.c