]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'usb/usb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 04:41:55 +0000 (15:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 04:41:55 +0000 (15:41 +1100)
commit5333ac2f22943c3c91ed984e5402d8fa6d6bf3db
treead5e69b1dd8744c6a9684a4c404a94864c9daae3
parent419b2ea4dbb9b2fd19888870ed1b4d0055bdbaa5
parent74bdf22b5c3858b06af46f19d05c23e76c40a3bb
Merge remote-tracking branch 'usb/usb-next'

Conflicts:
arch/arm/mach-omap2/Makefile
28 files changed:
Documentation/usb/power-management.txt
MAINTAINERS
arch/arm/mach-mmp/pxa168.c
arch/arm/mach-omap2/Makefile
drivers/usb/Kconfig
drivers/usb/class/cdc-acm.c
drivers/usb/class/cdc-wdm.c
drivers/usb/core/driver.c
drivers/usb/core/hcd.c
drivers/usb/core/hub.c
drivers/usb/gadget/at91_udc.c
drivers/usb/gadget/langwell_udc.c
drivers/usb/gadget/mv_udc_core.c
drivers/usb/gadget/net2280.c
drivers/usb/gadget/uvc.h
drivers/usb/gadget/uvc_v4l2.c
drivers/usb/host/Makefile
drivers/usb/host/ehci-au1xxx.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ohci-au1xxx.c
drivers/usb/host/ohci-pnx4008.c
drivers/usb/host/xhci-hub.c
drivers/usb/host/xhci-ring.c
drivers/usb/musb/musb_gadget.c
drivers/usb/storage/realtek_cr.c
include/linux/sched.h
include/linux/usb/ch9.h
kernel/signal.c