sugar/linux
1
0
Fork 0
Code Activity
Files
5135e633f92ab4deb3600a30cbbec6e0929fc8a4
linux/drivers/usb/gadget
History
David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-01-15 15:05:59 -05:00
..
acm_ms.c
usb: gadget: remove usb_gadget_controller_number()
2012-09-10 16:43:24 +03:00
amd5536udc.c
usb: gadget: amd5536udc: avoid NULL pointer dereference in udc_pci_probe()
2012-12-13 12:03:55 +02:00
amd5536udc.h
…
at91_udc.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
at91_udc.h
…
atmel_usba_udc.c
arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
2012-11-06 20:29:33 +08:00
atmel_usba_udc.h
…
audio.c
usb: gadget: remove usb_gadget_controller_number()
2012-09-10 16:43:24 +03:00
bcm63xx_udc.c
usb: remove use of __devexit
2012-11-21 13:27:17 -08:00
cdc2.c
usb: gadget: remove usb_gadget_controller_number()
2012-09-10 16:43:24 +03:00
composite.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
config.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
dbgp.c
usb: gadget: libcomposite: add epautoconf.c to libcomposite
2012-09-10 15:37:51 +03:00
dummy_hcd.c
usb: gadget: dummy: fix enumeration with g_multi
2012-12-13 11:58:46 +02: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: let f_* use usb_string_ids_tab() where it makes sense
2012-10-31 15:11:47 +02:00
f_ecm.c
usb: gadget: let f_* use usb_string_ids_tab() where it makes sense
2012-10-31 15:11:47 +02:00
f_eem.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
f_fs.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
f_hid.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
f_loopback.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
f_mass_storage.c
usb: gadget: storage_common: Drop #ifdefs used for the sake of FSG.
2012-11-08 16:03:35 +02:00
f_midi.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
f_ncm.c
usb: gadget: ncm: correct endianess conversion
2012-11-08 16:05:39 +02:00
f_obex.c
usb: gadget: let f_* use usb_string_ids_tab() where it makes sense
2012-10-31 15:11:47 +02:00
f_phonet.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
f_rndis.c
usb: gadget: let f_* use usb_string_ids_tab() where it makes sense
2012-10-31 15:11:47 +02:00
f_serial.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
f_sourcesink.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
f_subset.c
usb: gadget: let f_* use usb_string_ids_tab() where it makes sense
2012-10-31 15:11:47 +02:00
f_uac1.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
f_uac2.c
usb: remove use of __devinit
2012-11-21 13:27:16 -08:00
f_uvc.c
usb: gadget: let f_* use usb_string_ids_tab() where it makes sense
2012-10-31 15:11:47 +02:00
f_uvc.h
usb: gadget: uvc: Add super-speed support to UVC webcam gadget
2012-06-04 18:12:36 +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: remove use of __devexit
2012-11-21 13:27:17 -08: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: fix typo in drivers/usb
2012-11-06 15:04:14 +02: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
…
g_ffs.c
usb: gadget: libcomposite: move composite.c into libcomposite
2012-09-10 16:13:03 +03:00
g_zero.h
…
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
…
hid.c
usb: remove use of __devexit
2012-11-21 13:27:17 -08:00
imx_udc.c
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
imx_udc.h
…
inode.c
usb: gadget: remove DMA_ADDR_INVALID from f_uac2 and gadgetfs
2012-10-31 15:10:06 +02:00
Kconfig
Merge tag 'gadget-for-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
2012-11-11 17:31:53 -08:00
lpc32xx_udc.c
usb: remove use of __devexit
2012-11-21 13:27:17 -08: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 File-backed Storage Gadget (g_file_storage).
2012-11-08 16:01:04 +02: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: remove use of __devexit
2012-11-21 13:27:17 -08: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: mv_udc: fix the clk APIs
2012-12-13 11:58:41 +02:00
mv_udc.h
…
ncm.c
usb: gadget: remove usb_gadget_controller_number()
2012-09-10 16:43:24 +03:00
ndis.h
…
net2272.c
usb: remove use of __devexit
2012-11-21 13:27:17 -08:00
net2272.h
…
net2280.c
usb: gadget: Remove File-backed Storage Gadget (g_file_storage).
2012-11-08 16:01:04 +02:00
net2280.h
…
nokia.c
usb: gadget: remove usb_gadget_controller_number()
2012-09-10 16:43:24 +03:00
omap_udc.c
Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-12-13 10:58:20 -08:00
omap_udc.h
…
pch_udc.c
usb: gadget: remove global variable composite in composite.c
2012-09-10 15:35:41 +03:00
printer.c
usb: gadget: always update HS/SS descriptors and create a copy of them
2012-10-31 15:09:44 +02:00
pxa25x_udc.c
ARM: move udc_pxa2xx.h to linux/platform_data
2012-11-16 11:35:30 +00:00
pxa25x_udc.h
usb: gadget: pxa25x: make it compile with debug again
2012-09-10 15:35:58 +03:00
pxa27x_udc.c
Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-10-01 19:11:38 -07:00
pxa27x_udc.h
usb: gadget: Remove File-backed Storage Gadget (g_file_storage).
2012-11-08 16:01:04 +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
…
s3c2410_udc.c
Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-10-01 19:11:38 -07:00
s3c2410_udc.h
…
s3c-hsotg.c
usb: gadget: s3c-hsotg: Fix invalid free of devm_ allocated data
2012-12-13 11:58:42 +02:00
s3c-hsotg.h
…
s3c-hsudc.c
usb: remove use of __devinit
2012-11-21 13:27:16 -08: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
usb: gadget: storage_common: Make fsg_lun_is_open() a function.
2012-11-08 16:04:04 +02:00
tcm_usb_gadget.c
usb: gadget: tcm_usb_gadge: fix to return error or 0 in tcm_usbg_drop_nexus()
2012-12-13 12:04:00 +02: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
ethtool: fix drvinfo strings set in drivers
2013-01-06 21:06:31 -08:00
u_ether.h
…
u_phonet.h
…
u_serial.c
usb: gadget: u_serial: fix switch off blocked
2012-12-13 12:04:46 +02:00
u_serial.h
…
u_uac1.c
gadgetfs: clean up
2012-07-29 21:24:21 +04:00
u_uac1.h
…
udc-core.c
usb: gadget: Remove reference to is_dualspeed from sysfs.
2012-11-08 16:04:34 +02:00
usbstring.c
usb: gadget: libcomposite: move MODULE_VERSION to composite.c
2012-09-10 16:13:03 +03:00
uvc_queue.c
…
uvc_queue.h
…
uvc_v4l2.c
…
uvc_video.c
…
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