Linux 3.4.1

Conflicts:
	Makefile
	drivers/usb/core/hub.c