Merge branch 3.13-rc4 into usb-next

2013-12-16 08:46:03 -08:00
parent 319e2e3f63 3d724fa513
commit d59abb9325
121 changed files with 6996 additions and 5240 deletions
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -2657,6 +2657,7 @@ int musb_host_setup(struct musb *musb, int power_budget)
 	if (ret < 0)
 		return ret;

+	device_wakeup_enable(hcd->self.controller);
 	return 0;
 }