linux/drivers/usb/gadget
Linus Torvalds d9a807461f USB merge for 3.7-rc1
Here is the big USB pull request for 3.7-rc1
 
 There are lots of gadget driver changes (including copying a bunch of
 files into the drivers/staging/ccg/ directory so that the other gadget
 drivers can be fixed up properly without breaking that driver), and we
 remove the old obsolete ub.c driver from the tree.  There are also the
 usual XHCI set of updates, and other various driver changes and updates.
 We also are trying hard to remove the old dbg() macro, but the final
 bits of that removal will be coming in through the networking tree
 before we can delete it for good.
 
 All of these patches have been in the linux-next tree.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAlBp3+AACgkQMUfUDdst+ym5vwCfe93FyJyXn/RDkGz7iBemvWFd
 vrwAoIxjaOa4/yWZWcgrWc5bP4aO3ssc
 =jYDr
 -----END PGP SIGNATURE-----

Merge tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB changes from Greg Kroah-Hartman:
 "Here is the big USB pull request for 3.7-rc1

  There are lots of gadget driver changes (including copying a bunch of
  files into the drivers/staging/ccg/ directory so that the other gadget
  drivers can be fixed up properly without breaking that driver), and we
  remove the old obsolete ub.c driver from the tree.

  There are also the usual XHCI set of updates, and other various driver
  changes and updates.  We also are trying hard to remove the old dbg()
  macro, but the final bits of that removal will be coming in through
  the networking tree before we can delete it for good.

  All of these patches have been in the linux-next tree.

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

Fix up several annoying - but fairly mindless - conflicts due to the
termios structure having moved into the tty device, and often clashing
with dbg -> dev_dbg conversion.

* tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (339 commits)
  USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc
  USB: uas: fix gcc warning
  USB: uas: fix locking
  USB: Fix race condition when removing host controllers
  USB: uas: add locking
  USB: uas: fix abort
  USB: uas: remove aborted field, replace with status bit.
  USB: uas: fix task management
  USB: uas: keep track of command urbs
  xhci: Intel Panther Point BEI quirk.
  powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
  USB: ftdi_sio: add TIAO USB Multi-Protocol Adapter (TUMPA) support
  Revert "usb : Add sysfs files to control port power."
  USB: serial: remove vizzini driver
  usb: host: xhci: Fix Null pointer dereferencing with 71c731a for non-x86 systems
  Increase XHCI suspend timeout to 16ms
  USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq
  USB: sierra_ms: don't keep unused variable
  fsl/usb: Add support for USB controller version 2.4
  USB: qcaux: add Pantech vendor class match
  ...
2012-10-01 13:23:01 -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
at91_udc.c Merge 3.6-rc6 into usb-next 2012-09-16 20:42:46 -07:00
at91_udc.h
atmel_usba_udc.c usb: gadget: atmel_usba_udc: Remove unneeded condition 2012-06-04 18:15:44 +03: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: 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
f_ecm.c usb: gadget: use %pm to print mac addresses 2012-08-23 11:04:20 +03:00
f_eem.c
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
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
f_phonet.c netvm: propagate page->pfmemalloc from skb_alloc_page to skb 2012-07-31 18:42:46 -07:00
f_rndis.c
f_serial.c
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
f_uac2.c usb: gadget: remove __devexit in f_uac2 2012-09-10 15:34:14 +03:00
f_uvc.c
f_uvc.h
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
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: 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
inode.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
Kconfig USB: remove CONFIG_EXPERIMENTAL dependancies 2012-09-17 23:00:15 -07: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
ncm.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
ndis.h
net2272.c
net2272.h
net2280.c
net2280.h
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
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
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 usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
s3c2410_udc.h
s3c-hsotg.c usb: gadget: patches for v3.7 merge window 2012-09-11 13:39:49 -07:00
s3c-hsotg.h
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
u_phonet.h
u_serial.c Merge 3.6-rc6 into tty-next 2012-09-16 17:31:36 -07: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 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
uvc_queue.h
uvc_v4l2.c
uvc_video.c
uvc.h
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