Squashed update of kernel from 3.4.86 to 3.4.87

Conflicts:

	drivers/usb/core/driver.c