Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits) USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004) USB: serial: ftdi_sio: add support for TIOCSERGETLSR USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport USB: atmel_usba_udc: fix freeing irq in usba_udc_remove() usb: ehci-omap: fix tll channel enable mask usb: ohci-omap3: fix trivial typo USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096 USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's USB: gadget: update ci13xxx to work with g_ether USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers Revert "USB: musb: pm: don't rely fully on clock support" Revert "USB: musb: blackfin: pm: make it work" USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path USB: uas: Ensure we only bind to a UAS interface USB: uas: Rename sense pipe and sense urb to status pipe and status urb USB: uas: Use kzalloc instead of kmalloc USB: uas: Fix up the Sense IU usb: musb: core: kill unneeded #include's DA8xx: assign name to MUSB IRQ resource usb: gadget: g_ncm added ... Manually fix up trivial conflicts in USB Kconfig changes in: arch/arm/mach-omap2/Kconfig arch/sh/Kconfig drivers/usb/Kconfig drivers/usb/host/ehci-hcd.c and annoying chip clock data conflicts in: arch/arm/mach-omap2/clock3xxx_data.c arch/arm/mach-omap2/clock44xx_data.c
No related branches found
No related tags found
Showing
- Documentation/usb/power-management.txt 58 additions, 55 deletionsDocumentation/usb/power-management.txt
- arch/arm/mach-davinci/usb.c 5 additions, 1 deletionarch/arm/mach-davinci/usb.c
- arch/arm/mach-omap2/Kconfig 1 addition, 0 deletionsarch/arm/mach-omap2/Kconfig
- arch/arm/mach-omap2/Makefile 4 additions, 2 deletionsarch/arm/mach-omap2/Makefile
- arch/arm/mach-omap2/board-4430sdp.c 29 additions, 6 deletionsarch/arm/mach-omap2/board-4430sdp.c
- arch/arm/mach-omap2/board-n8x0.c 2 additions, 3 deletionsarch/arm/mach-omap2/board-n8x0.c
- arch/arm/mach-omap2/board-omap4panda.c 10 additions, 4 deletionsarch/arm/mach-omap2/board-omap4panda.c
- arch/arm/mach-omap2/clock2420_data.c 1 addition, 1 deletionarch/arm/mach-omap2/clock2420_data.c
- arch/arm/mach-omap2/clock2430_data.c 1 addition, 1 deletionarch/arm/mach-omap2/clock2430_data.c
- arch/arm/mach-omap2/clock3xxx_data.c 9 additions, 4 deletionsarch/arm/mach-omap2/clock3xxx_data.c
- arch/arm/mach-omap2/clock44xx_data.c 6 additions, 1 deletionarch/arm/mach-omap2/clock44xx_data.c
- arch/arm/mach-omap2/omap_phy_internal.c 149 additions, 0 deletionsarch/arm/mach-omap2/omap_phy_internal.c
- arch/arm/mach-omap2/usb-ehci.c 136 additions, 8 deletionsarch/arm/mach-omap2/usb-ehci.c
- arch/arm/mach-omap2/usb-musb.c 102 additions, 2 deletionsarch/arm/mach-omap2/usb-musb.c
- arch/arm/mach-omap2/usb-tusb6010.c 1 addition, 1 deletionarch/arm/mach-omap2/usb-tusb6010.c
- arch/arm/plat-omap/include/plat/omap44xx.h 5 additions, 0 deletionsarch/arm/plat-omap/include/plat/omap44xx.h
- arch/arm/plat-omap/include/plat/usb.h 10 additions, 0 deletionsarch/arm/plat-omap/include/plat/usb.h
- arch/blackfin/mach-bf527/boards/ad7160eval.c 1 addition, 1 deletionarch/blackfin/mach-bf527/boards/ad7160eval.c
- arch/blackfin/mach-bf527/boards/cm_bf527.c 3 additions, 1 deletionarch/blackfin/mach-bf527/boards/cm_bf527.c
- arch/blackfin/mach-bf527/boards/ezbrd.c 3 additions, 1 deletionarch/blackfin/mach-bf527/boards/ezbrd.c
Loading
Please register or sign in to comment