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

..

acm_ms.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

amd5536udc.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

amd5536udc.h

usb: gadget: Update amd5536udc to use usb_endpoint_descriptor inside the struct usb_ep

2012-05-04 15:52:52 +03:00

at91_udc.c

Merge 3.6-rc6 into usb-next

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

at91_udc.h

usb: gadget: Update at91_udc to use usb_endpoint_descriptor inside the struct usb_ep

2012-05-04 15:52:53 +03:00

atmel_usba_udc.c

usb: gadget: atmel_usba_udc: Remove unneeded condition

2012-06-04 18:15:44 +03:00

atmel_usba_udc.h

usb: gadget: Update atmel_usba_udc to use usb_endpoint_descriptor inside the struct usb_ep

2012-05-04 15:52:53 +03:00

audio.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

bcm63xx_udc.c

usb: gadget: bcm63xx UDC driver

2012-09-05 15:39:41 +03:00

cdc2.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

composite.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

config.c

usb: gadget: libcomposite: move config.c into libcomposite

2012-09-10 15:36:16 +03:00

dbgp.c

usb: gadget: libcomposite: add epautoconf.c to libcomposite

2012-09-10 15:37:51 +03:00

dummy_hcd.c

Merge 3.6-rc6 into usb-next

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

epautoconf.c

usb: gadget: libcomposite: add epautoconf.c to libcomposite

2012-09-10 15:37:51 +03:00

ether.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

f_acm.c

usb: gadget: add usb3.0 descriptors to serial gadgets

2012-02-09 10:11:36 +02:00

f_ecm.c

usb: gadget: use %pm to print mac addresses

2012-08-23 11:04:20 +03:00

f_eem.c

usb gadget: clean up FSF boilerplate text

2011-09-09 16:00:09 -07:00

f_fs.c

usb: gadget: add multiple definition guards

2012-09-06 19:52:23 +03:00

f_hid.c

usb: gadget: libcomposite: move composite.c into libcomposite

2012-09-10 16:13:03 +03:00

f_loopback.c

usb: gadget: add isochronous support to gadget zero

2012-05-04 15:53:08 +03:00

f_mass_storage.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

f_midi.c

usb: gadget: Provide a default implementation of default manufacturer string

2012-09-10 16:13:02 +03:00

f_ncm.c

usb: gadget: use %pm to print mac addresses

2012-08-23 11:04:20 +03:00

f_obex.c

usb: Add module.h to drivers/usb consumers who really use it.

2011-10-31 19:31:25 -04:00

f_phonet.c

netvm: propagate page->pfmemalloc from skb_alloc_page to skb

2012-07-31 18:42:46 -07:00

f_rndis.c

USB 3.5-rc1 pull request

2012-05-22 15:50:46 -07:00

f_serial.c

usb: gadget: add usb3.0 descriptors to serial gadgets

2012-02-09 10:11:36 +02:00

f_sourcesink.c

usb: gadget: move USB_BUFSIZ into global composite.h

2012-09-10 16:00:01 +03:00

f_subset.c

usb: gadget: use %pm to print mac addresses

2012-08-23 11:04:20 +03:00

f_uac1.c

usb: gadget: audio: Move string IDs to audio.c

2012-02-15 10:10:25 +02:00

f_uac2.c

usb: gadget: remove __devexit in f_uac2

2012-09-10 15:34:14 +03:00

f_uvc.c

usb: gadget: uvc: Add super-speed support to UVC webcam gadget

2012-06-04 18:12:36 +03:00

f_uvc.h

usb: gadget: uvc: Add super-speed support to UVC webcam gadget

2012-06-04 18:12:36 +03:00

file_storage.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

fsl_mxc_udc.c

usb: gadget: fsl_mxc_udc: do not depend on grouped clocks

2012-06-22 13:09:52 +03:00

fsl_qe_udc.c

usb: gadget: fsl_qe_udc: Remove unneeded condition

2012-06-04 18:15:45 +03:00

fsl_qe_udc.h

usb: gadget: Complete fsl qe/udc driver conversion

2012-06-12 13:32:29 +03:00

fsl_udc_core.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

fsl_usb2_udc.h

usb: gadget: regression fix - usage of usb_ep

2012-06-04 18:24:49 +03:00

fusb300_udc.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

fusb300_udc.h

usb: gadget: Update fusb300_udc to use usb_endpoint_descriptor inside the struct usb_ep

2012-05-04 15:52:55 +03:00

g_ffs.c

usb: gadget: libcomposite: move composite.c into libcomposite

2012-09-10 16:13:03 +03:00

g_zero.h

usb: gadget: add isochronous support to gadget zero

2012-05-04 15:53:08 +03:00

gadget_chips.h

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

gmidi.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

goku_udc.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

goku_udc.h

usb: gadget: Update goku_udc to use usb_endpoint_descriptor inside the struct usb_ep

2012-05-04 15:52:55 +03:00

hid.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

imx_udc.c

usb: imx_udc.c: Use clk_prepare_enable/clk_disable_unprepare

2012-06-12 13:30:59 +03:00

imx_udc.h

usb gadget: clean up FSF boilerplate text

2011-09-09 16:00:09 -07:00

inode.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

Kconfig

usb: gadget: start with libcomposite

2012-09-10 15:36:04 +03:00

lpc32xx_udc.c

drivers/usb/gadget/lpc32xx_udc.c: adjust inconsistent IS_ERR and PTR_ERR

2012-09-05 16:52:09 -07:00

m66592-udc.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

m66592-udc.h

gadget/m66592: remove conditional compilation of clk code

2012-07-30 17:25:12 -07:00

Makefile

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

mass_storage.c

usb: gadget: libcomposite: move composite.c into libcomposite

2012-09-10 16:13:03 +03:00

multi.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

mv_u3d_core.c

usb: gadget: mv: Add USB 3.0 device driver for Marvell PXA2128 chip.

2012-06-22 13:08:21 +03:00

mv_u3d.h

usb: gadget: mv: Add USB 3.0 device driver for Marvell PXA2128 chip.

2012-06-22 13:08:21 +03:00

mv_udc_core.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

mv_udc.h

usb: gadget: Update mv_udc to use usb_endpoint_descriptor inside the struct usb_ep

2012-05-04 15:52:57 +03:00

ncm.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

ndis.h

usb/net: rndis: break out <linux/rndis.h> defines

2012-05-12 15:02:22 -04:00

net2272.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

net2272.h

…

net2280.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

net2280.h

usb gadget: clean up FSF boilerplate text

2011-09-09 16:00:09 -07:00

nokia.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

omap_udc.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

omap_udc.h

usb: gadget: Update omap_udc to use usb_endpoint_descriptor inside the struct usb_ep

2012-05-04 15:52:57 +03:00

pch_udc.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

printer.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00

pxa25x_udc.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

pxa25x_udc.h

usb: gadget: pxa25x: make it compile with debug again

2012-09-10 15:35:58 +03:00

pxa27x_udc.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

pxa27x_udc.h

usb: otg: Rename otg_transceiver to usb_phy

2012-02-13 13:34:36 +02:00

r8a66597-udc.c

gadget/r8a66597: remove conditional compilation of clk code

2012-07-30 17:25:12 -07:00

r8a66597-udc.h

gadget/r8a66597: remove conditional compilation of clk code

2012-07-30 17:25:12 -07:00

rndis.c

usb: gadget: use native print_hex_dump_bytes()

2012-08-23 11:04:18 +03:00

rndis.h

usb/net: rndis: break out <linux/rndis.h> defines

2012-05-12 15:02:22 -04:00

s3c2410_udc.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

s3c2410_udc.h

usb: gadget: Update s3c2410_udc to use usb_endpoint_descriptor inside the struct usb_ep

2012-05-04 15:52:59 +03:00

s3c-hsotg.c

usb: gadget: patches for v3.7 merge window

2012-09-11 13:39:49 -07:00

s3c-hsotg.h

usb:hsotg:samsung: Remove the S3C_ prefix from registers definition.

2012-05-04 15:53:17 +03:00

s3c-hsudc.c

usb: gadget: s3c-hsudc: Replace 0 with NULL for pointers

2012-09-03 17:09:37 +03:00

serial.c

usb: gadget serial: don't shift bcd version left by 16

2012-09-10 20:04:20 +03:00

storage_common.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-08-01 10:26:23 -07:00

tcm_usb_gadget.c

usb: gadget: libcomposite: move composite.c into libcomposite

2012-09-10 16:13:03 +03:00

tcm_usb_gadget.h

usb: gadget: make sure each gadget is using same index for Product, Serial,…

2012-09-10 16:13:00 +03:00

u_ether.c

usb: gadget: patches for v3.7 merge window

2012-09-11 13:39:49 -07:00

u_ether.h

usb: gadget: f_rndis: Set rndis vendor parameters

2012-05-10 12:27:58 -07:00

u_phonet.h

…

u_serial.c

usb: gadget: add multiple definition guards

2012-09-06 19:52:23 +03:00

u_serial.h

usb: gadget: add usb_endpoint_descriptor to struct usb_ep

2011-06-28 11:14:36 -07:00

u_uac1.c

gadgetfs: clean up

2012-07-29 21:24:21 +04:00

u_uac1.h

usb: gadget: Rename audio function to uac1

2012-02-15 10:09:48 +02:00

udc-core.c

usb: gadget: remove global variable composite in composite.c

2012-09-10 15:35:41 +03:00

usbstring.c

usb: gadget: libcomposite: move MODULE_VERSION to composite.c

2012-09-10 16:13:03 +03:00

uvc_queue.c

[media] usb: gadget/uvc: Remove non-required locking from 'uvc_queue_next_buffer' routine

2012-04-10 15:46:02 -03:00

uvc_queue.h

…

uvc_v4l2.c

Merge remote-tracking branch 'linus/master' into staging/for_v3.5

2012-05-15 08:39:25 -03:00

uvc_video.c

usb gadget: clean up FSF boilerplate text

2011-09-09 16:00:09 -07:00

uvc.h

usb: gadget: uvc: Add super-speed support to UVC webcam gadget

2012-06-04 18:12:36 +03:00

webcam.c

usb: gadget: libcomposite: move composite.c into libcomposite

2012-09-10 16:13:03 +03:00

zero.c

usb: gadget: remove usb_gadget_controller_number()

2012-09-10 16:43:24 +03:00