Merge 3.1-rc4 into usb-next

This was done to resolve a conflict in this file:
	drivers/usb/host/xhci-ring.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/host/ehci-hub.c
Simple merge

diff --cc drivers/usb/host/ehci-s5p.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
index 54139a2,bf0b52c..58a6e26
--- 1/drivers/usb/host/xhci-ring.c
--- 2/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@@ -3249,11 -3237,9 +3249,11 @@@ static int xhci_queue_isoc_tx(struct xh
                addr = start_addr + urb->iso_frame_desc[i].offset;
                td_len = urb->iso_frame_desc[i].length;
                td_remain_len = td_len;
 -              /* FIXME: Ignoring zero-length packets, can those happen? */
                total_packet_count = roundup(td_len,
-                               le16_to_cpu(urb->ep->desc.wMaxPacketSize));
+                               usb_endpoint_maxp(&urb->ep->desc));
 +              /* A zero-length transfer still involves at least one packet. */
 +              if (total_packet_count == 0)
 +                      total_packet_count++;
                burst_count = xhci_get_burst_count(xhci, urb->dev, urb,
                                total_packet_count);
                residue = xhci_get_last_burst_packet_count(xhci,

diff --cc drivers/usb/host/xhci.c
Simple merge

diff --cc drivers/usb/musb/musb_gadget.c
Simple merge

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