Merge 2.6.38-rc5 into usb-next

This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.

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

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

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

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

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

diff --cc include/linux/usb/hcd.h
Simple merge