Merge 2.6.39-rc4 into usb-next

This is needed to help resolve some xhci issues and other minor
differences.

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

diff --cc drivers/usb/Kconfig
index 006489d82dc3dbc41b3f1d96fbea3511cb3e6d25,cf7614d29f031a02b2325f672db2625f3352d98b..a1b3750cadb3806afcfffbb139311d05d3825834
--- 1/drivers/usb/Kconfig
--- 2/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@@ -65,8 -65,8 +65,9 @@@ config USB_ARCH_HAS_EHC
        default y if ARCH_CNS3XXX
        default y if ARCH_VT8500
        default y if PLAT_SPEAR
+       default y if PLAT_S5P
        default y if ARCH_MSM
 +      default y if MICROBLAZE
        default PCI
  
  # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.

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

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