Merge 3.0-rc2 into usb-linus as it's needed by some USB patches

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-14 06:51:10 -07:00
parent e73a9891b3 2c53b436a3
commit dcc8545790
460 changed files with 5025 additions and 2786 deletions
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -922,5 +922,6 @@ void __devexit usbhs_mod_gadget_remove(struct usbhs_priv *priv)
 {
 	struct usbhsg_gpriv *gpriv = usbhsg_priv_to_gpriv(priv);

+	kfree(gpriv->uep);
 	kfree(gpriv);
 }