Merge remote-tracking branch 'usb/usb-next'

Conflicts:
	arch/arm/mach-omap2/Makefile

diff --cc Documentation/usb/power-management.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-mmp/pxa168.c
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
index 512978586b2b619f979b87919c7c5042940d320d,7317a2b39dd17fbae0b2c54d6cf4d2650e83b214..69ab1c069134ccee42da01c015aea9d219408f4a
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -216,21 -229,24 +216,17 @@@ obj-$(CONFIG_MACH_OMAP_ZOOM3)           += board
                                           board-zoom-debugboard.o
  obj-$(CONFIG_MACH_OMAP_3630SDP)               += board-3630sdp.o \
                                           board-zoom-peripherals.o \
 -                                         board-zoom-display.o \
 -                                         board-flash.o \
 -                                         hsmmc.o
 -obj-$(CONFIG_MACH_CM_T35)             += board-cm-t35.o \
 -                                         hsmmc.o
 +                                         board-zoom-display.o
 +obj-$(CONFIG_MACH_CM_T35)             += board-cm-t35.o
  obj-$(CONFIG_MACH_CM_T3517)           += board-cm-t3517.o
 -obj-$(CONFIG_MACH_IGEP0020)           += board-igep0020.o \
 -                                         hsmmc.o
 -obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)    += board-omap3touchbook.o \
 -                                         hsmmc.o
 -obj-$(CONFIG_MACH_OMAP_4430SDP)               += board-4430sdp.o \
 -                                         hsmmc.o
 -obj-$(CONFIG_MACH_OMAP4_PANDA)                += board-omap4panda.o \
 -                                         hsmmc.o
 +obj-$(CONFIG_MACH_IGEP0020)           += board-igep0020.o
 +obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)    += board-omap3touchbook.o
- obj-$(CONFIG_MACH_OMAP_4430SDP)               += board-4430sdp.o \
-                                          omap_phy_internal.o
- obj-$(CONFIG_MACH_OMAP4_PANDA)                += board-omap4panda.o \
-                                          omap_phy_internal.o
++obj-$(CONFIG_MACH_OMAP_4430SDP)               += board-4430sdp.o
++obj-$(CONFIG_MACH_OMAP4_PANDA)                += board-omap4panda.o
 +
- obj-$(CONFIG_MACH_PCM049)             += board-omap4pcm049.o \
-                                          omap_phy_internal.o
++obj-$(CONFIG_MACH_PCM049)             += board-omap4pcm049.o
  
- obj-$(CONFIG_MACH_OMAP3517EVM)                += board-am3517evm.o \
-                                          omap_phy_internal.o
+ obj-$(CONFIG_MACH_OMAP3517EVM)                += board-am3517evm.o
  
  obj-$(CONFIG_MACH_CRANEBOARD)         += board-am3517crane.o
  

diff --cc arch/arm/mach-shmobile/board-mackerel.c
index 81b3dfdf331b4bbccdb1576ee9f51ddfe7130259,c20612ea5d0e939cafc554f594220faa6ed3a25c..3689ad2e9156b42711f4f63fb799292b7fc4595d
--- 1/arch/arm/mach-shmobile/board-mackerel.c
--- 2/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@@ -811,10 -808,9 +811,11 @@@ static struct usbhs_private usbhs1_priv
                },
                .driver_param = {
                        .buswait_bwait  = 4,
+                       .has_otg        = 1,
                        .pipe_type      = usbhs1_pipe_cfg,
                        .pipe_size      = ARRAY_SIZE(usbhs1_pipe_cfg),
 +                      .d0_tx_id       = SHDMA_SLAVE_USB1_TX,
 +                      .d1_rx_id       = SHDMA_SLAVE_USB1_RX,
                },
        },
  };

diff --cc drivers/usb/Kconfig
index 85d5a011dca6a86dbffb50bfc8b96c08cee9edca,4ac2750491de8bf6de1bee06a398c748b0e59ea6..791f11bed6063b6fec2ffa4ab78fc4177f70b509
--- 1/drivers/usb/Kconfig
--- 2/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@@ -54,8 -60,9 +60,8 @@@ config USB_ARCH_HAS_OHC
  # some non-PCI hcds implement EHCI
  config USB_ARCH_HAS_EHCI
        boolean
-       default y if PPC_83xx
+       default y if FSL_SOC
        default y if PPC_MPC512x
 -      default y if SOC_AU1200
        default y if ARCH_IXP4XX
        default y if ARCH_W90X900
        default y if ARCH_AT91SAM9G45

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/class/cdc-wdm.c
Simple merge

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

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

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

diff --cc drivers/usb/gadget/at91_udc.c
Simple merge

diff --cc drivers/usb/gadget/langwell_udc.c
Simple merge

diff --cc drivers/usb/gadget/mv_udc_core.c
Simple merge

diff --cc drivers/usb/gadget/net2280.c
Simple merge

diff --cc drivers/usb/gadget/uvc.h
Simple merge

diff --cc drivers/usb/gadget/uvc_v4l2.c
Simple merge

diff --cc drivers/usb/host/Makefile
Simple merge

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

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

diff --cc drivers/usb/host/ohci-au1xxx.c
Simple merge

diff --cc drivers/usb/host/ohci-pnx4008.c
Simple merge

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

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

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

diff --cc drivers/usb/storage/realtek_cr.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

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

diff --cc kernel/signal.c
Simple merge