Greg Kroah-Hartman 2bcb132c69 Merge 3.6-rc6 into usb-next ...

This resolves the merge problems with:
	drivers/usb/dwc3/gadget.c
	drivers/usb/musb/tusb6010.c
that had been seen in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-09-16 20:42:46 -07:00

..

am35x.c

usb: musb: patches for v3.7 merge window

2012-09-11 13:56:29 -07:00

blackfin.c

usb: musb: patches for v3.7 merge window

2012-09-11 13:56:29 -07:00

blackfin.h

usb: musb: drop a gigantic amount of ifdeferry

2011-07-01 14:31:10 -07:00

cppi_dma.c

usb: musb: Make dma_controller_create __devinit

2012-08-09 18:05:07 +03:00

cppi_dma.h

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

da8xx.c

usb: musb: patches for v3.7 merge window

2012-09-11 13:56:29 -07:00

davinci.c

usb: musb: patches for v3.7 merge window

2012-09-11 13:56:29 -07:00

davinci.h

usb: musb: davinci: Fix build breakage

2012-06-04 18:29:42 +03:00

Kconfig

usb: musb: patches for v3.7 merge window

2012-09-11 13:56:29 -07:00

Makefile

usb: musb: Add support for ti81xx platform

2012-05-04 13:59:34 +03:00

musb_core.c

usb: musb: kill global and static for multi instance

2012-09-11 17:34:45 +03:00

musb_core.h

usb: musb: kill global and static for multi instance

2012-09-11 17:34:45 +03:00

musb_debug.h

usb: musb: remove extern qualifier from musb_debug.h header

2011-12-21 13:21:02 +02:00

musb_debugfs.c

usb: musb: kill global and static for multi instance

2012-09-11 17:34:45 +03:00

musb_dma.h

usb: musb: Make dma_controller_create __devinit

2012-08-09 18:05:07 +03:00

musb_dsps.c

usb: musb: patches for v3.7 merge window

2012-09-11 13:56:29 -07:00

musb_gadget_ep0.c

usb: musb: headers cleanup

2011-12-12 11:51:52 +02:00

musb_gadget.c

usb: musb: Remove redundant if statement

2012-08-09 12:34:47 +03:00

musb_gadget.h

usb: musb: gadget: do not poke with gadget's list_head

2011-02-17 21:11:46 +02:00

musb_host.c

Merge 3.6-rc6 into usb-next

2012-09-16 20:42:46 -07:00

musb_host.h

usb: musb: host: Handle highmem in PIO mode

2012-08-07 14:27:18 +03:00

musb_io.h

m68k: Make sure {read,write}s[bwl]() are always defined

2012-04-22 20:16:50 +02:00

musb_regs.h

usb: musb: tusb6010: fix compilation

2011-08-12 11:52:50 +03:00

musb_virthub.c

usb: musb: drop useless board_mode usage

2012-08-09 12:34:46 +03:00

musbhsdma.c

Merge 3.6-rc6 into usb-next

2012-09-16 20:42:46 -07:00

musbhsdma.h

Merge branches 'devel-cleanup', 'devel-board', 'devel-early-init' and 'devel-ti816x' into omap-for-linus

2011-02-16 11:32:38 -08:00

omap2430.c

usb: musb: add musb_ida for multi instance support

2012-09-11 17:34:41 +03:00

omap2430.h

usb: musb: omap: write directly to mailbox instead of using phy

2012-09-11 12:13:22 +03:00

tusb6010_omap.c

usb: musb: Make dma_controller_create __devinit

2012-08-09 18:05:07 +03:00

tusb6010.c

usb: musb: patches for v3.7 merge window

2012-09-11 13:56:29 -07:00

tusb6010.h

USB: musb: Remove my email address from few musb related drivers

2009-04-23 14:15:27 -07:00

ux500_dma.c

usb: musb: Make dma_controller_create __devinit

2012-08-09 18:05:07 +03:00

ux500.c

usb: musb: add musb_ida for multi instance support

2012-09-11 17:34:41 +03:00