Squashed update of kernel from 3.4.86 to 3.4.87

Conflicts:
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/ethernet/broadcom/tg3.h
	drivers/usb/core/driver.c
	drivers/usb/host/xhci.h