USB: Merge 2.6.37-rc5 into usb-next

This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/usb/gadget/composite.c
index 21dc0da36ab797e1953ebdc54ae259ba4c9b25ac,8572dad5ecbbffd0e0eb71ece46559b30ca6f796..f6ff8456d52d59fe027f88bbabf678982299282e
--- 1/drivers/usb/gadget/composite.c
--- 2/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@@ -1126,7 -1118,15 +1118,15 @@@ static int composite_bind(struct usb_ga
        cdev->desc = *composite->dev;
        cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
  
 -      /* stirng overrides */
+       /* standardized runtime overrides for device ID data */
+       if (idVendor)
+               cdev->desc.idVendor = cpu_to_le16(idVendor);
+       if (idProduct)
+               cdev->desc.idProduct = cpu_to_le16(idProduct);
+       if (bcdDevice)
+               cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);
+ 
 +      /* string overrides */
        if (iManufacturer || !cdev->desc.iManufacturer) {
                if (!iManufacturer && !composite->iManufacturer &&
                    !*composite_manufacturer)

diff --cc drivers/usb/serial/ftdi_sio.c
Simple merge