kevin/linux
1
Fork 0
Code
af6df871ba
linux/drivers/usb/gadget
History
Linus Torvalds 664a41b8a9 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
  [media] ir-mce_kbd-decoder: include module.h for its facilities
  [media] ov5642: include module.h for its facilities
  [media] em28xx: Fix DVB-C maxsize for em2884
  [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
  [media] v4l: mt9v032: Fix Bayer pattern
  [media] V4L: mt9m111: rewrite set_pixfmt
  [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
  [media] V4L: initial driver for ov5642 CMOS sensor
  [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
  [media] V4L: soc-camera: remove soc-camera bus and devices on it
  [media] V4L: soc-camera: un-export the soc-camera bus
  [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
  [media] V4L: add media bus configuration subdev operations
  [media] V4L: soc-camera: group struct field initialisations together
  [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
  [media] V4L: pxa-camera: switch to using standard PM hooks
  [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
  [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
  [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
  [media] omap3isp: Support configurable HS/VS polarities
  ...

Fix up conflicts:
 - arch/arm/mach-omap2/board-rx51-peripherals.c:
     cleanup regulator supply definitions in mach-omap2
   vs
     OMAP3: RX-51: define vdds_csib regulator supply
 - drivers/staging/tm6000/tm6000-alsa.c (trivial)
2011-07-30 00:08:53 -07:00
..
amd5536udc.c usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
amd5536udc.h Fix common misspellings 2011-03-31 11:26:23 -03:00
at91_udc.c usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
at91_udc.h
atmel_usba_udc.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-07-25 23:08:32 -07:00
atmel_usba_udc.h
audio.c usb: gadget: add max_speed to usb_composite_driver 2011-07-01 14:27:05 -07:00
cdc2.c usb: gadget: add max_speed to usb_composite_driver 2011-07-01 14:27:05 -07:00
ci13xxx_msm.c usb: gadget: add platform module alias where it is missing 2011-07-01 14:27:07 -07:00
ci13xxx_pci.c USB: gadget: Introduce ci13xxx_udc_driver struct 2010-12-10 14:23:33 -08:00
ci13xxx_udc.c usb: gadget: ci13xx_udc.c: fix compile warning 2011-07-05 16:41:14 +03:00
ci13xxx_udc.h USB: gadget: Add test mode support for ci13xxx_udc 2011-02-25 11:33:57 -08:00
composite.c usb: gadget: defer setting maxpacket till ->setup() 2011-07-01 14:31:12 -07:00
config.c usb: gadget: use config_ep_by_speed() instead of ep_choose() 2011-06-28 11:14:37 -07:00
dbgp.c usb: gadget: defer setting maxpacket till ->setup() 2011-07-01 14:31:12 -07:00
dummy_hcd.c usb: gadget: dummy_hcd: convert to new-style udc-probe 2011-07-01 14:31:14 -07:00
epautoconf.c usb: gadget: add SuperSpeed support to the Gadget Framework 2011-07-01 14:27:05 -07:00
ether.c usb: gadget: add SS descriptors to Ethernet gadget 2011-07-08 13:55:30 +03:00
f_acm.c usb: gadget: use config_ep_by_speed() instead of ep_choose() 2011-06-28 11:14:37 -07:00
f_audio.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
f_ecm.c usb: gadget: add SS descriptors to Ethernet gadget 2011-07-08 13:55:30 +03:00
f_eem.c usb: gadget: add SS descriptors to Ethernet gadget 2011-07-08 13:55:30 +03:00
f_fs.c usb: gadget: add usb_endpoint_descriptor to struct usb_ep 2011-06-28 11:14:36 -07:00
f_hid.c usb: gadget: use config_ep_by_speed() instead of ep_choose() 2011-06-28 11:14:37 -07:00
f_loopback.c usb: gadget: zero: add superspeed support 2011-07-08 13:57:54 +03:00
f_mass_storage.c usb: gadget: use config_ep_by_speed() instead of ep_choose() 2011-06-28 11:14:37 -07:00
f_ncm.c usb: gadget: use config_ep_by_speed() instead of ep_choose() 2011-06-28 11:14:37 -07:00
f_obex.c usb: gadget: use config_ep_by_speed() instead of ep_choose() 2011-06-28 11:14:37 -07:00
f_phonet.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-07-25 23:08:32 -07:00
f_rndis.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
f_serial.c usb: gadget: use config_ep_by_speed() instead of ep_choose() 2011-06-28 11:14:37 -07:00
f_sourcesink.c usb: gadget: zero: add superspeed support 2011-07-08 13:57:54 +03:00
f_subset.c usb: gadget: add SS descriptors to Ethernet gadget 2011-07-08 13:55:30 +03:00
f_uvc.c USB: Gadget: Webcam: Return correct result of bind 2011-07-01 14:45:42 -07:00
f_uvc.h
file_storage.c usb: gadget: defer setting maxpacket till ->setup() 2011-07-01 14:31:12 -07:00
fsl_mxc_udc.c usb: gadget/fsl_mxc_udc: Detect the CPU type in run-time 2011-02-04 11:42:52 -08:00
fsl_qe_udc.c usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
fsl_qe_udc.h usb: fix a typo in a comment 2011-04-13 16:41:00 -07:00
fsl_udc_core.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-07-25 23:08:32 -07:00
fsl_usb2_udc.h USB: extend ehci-fsl and fsl_udc_core driver for OTG operation 2011-05-02 16:59:38 -07:00
fusb300_udc.c usb: gadget: fusb300_udc: fix compile warnings 2011-07-05 16:41:15 +03:00
fusb300_udc.h usb: udc: add Faraday fusb300 driver 2011-01-22 19:45:36 -08:00
g_ffs.c usb: gadget: add max_speed to usb_composite_driver 2011-07-01 14:27:05 -07:00
g_zero.h
gadget_chips.h usb: gadget: chips: remove ifdef trickery 2011-07-01 14:31:05 -07:00
gmidi.c usb: gadget: defer setting maxpacket till ->setup() 2011-07-01 14:31:12 -07:00
goku_udc.c usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
goku_udc.h
hid.c usb: gadget: add max_speed to usb_composite_driver 2011-07-01 14:27:05 -07:00
imx_udc.c usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
imx_udc.h
inode.c usb: gadget: defer setting maxpacket till ->setup() 2011-07-01 14:31:12 -07:00
Kconfig Merge branch 'for-next' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb into usb-next 2011-07-08 15:30:55 -07:00
langwell_udc.c usb: gadget: langwell_udc: fix compile warnings 2011-07-05 16:41:12 +03:00
langwell_udc.h
m66592-udc.c usb: gadget: m66592-udc: add pullup function 2011-07-09 01:08:40 +03:00
m66592-udc.h usb: gadget: m66592-udc: add function for external controller 2011-07-09 01:08:39 +03:00
Makefile usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
mass_storage.c usb: gadget: add max_speed to usb_composite_driver 2011-07-01 14:27:05 -07:00
multi.c usb: gadget: add max_speed to usb_composite_driver 2011-07-01 14:27:05 -07:00
mv_udc_core.c usb: gadget: add platform module alias where it is missing 2011-07-01 14:27:07 -07:00
mv_udc_phy.c
mv_udc.h
ncm.c usb: gadget: add max_speed to usb_composite_driver 2011-07-01 14:27:05 -07:00
ndis.h
net2272.c usb: gadget: net2272: fix compile warnings 2011-07-05 16:41:13 +03:00
net2272.h USB: net2272: driver for PLX NET2272 USB device controller 2011-06-06 16:47:27 -07:00
net2280.c usb: gadget: remove net2280_set_fifo_mode() 2011-07-01 14:31:08 -07:00
net2280.h
nokia.c usb: gadget: add max_speed to usb_composite_driver 2011-07-01 14:27:05 -07:00
omap_udc.c usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
omap_udc.h
pch_udc.c usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
printer.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-07-25 23:08:32 -07:00
pxa25x_udc.c usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
pxa25x_udc.h
pxa27x_udc.c usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
pxa27x_udc.h treewide: transciever/transceiver spelling fixes 2011-06-24 11:20:14 +02:00
r8a66597-udc.c usb: gadget: r8a66597-udc: add pullup function 2011-07-09 01:08:38 +03:00
r8a66597-udc.h usb: update email address in r8a66597-udc and m66592-udc 2011-07-08 12:47:27 +03:00
rndis.c
rndis.h
s3c2410_udc.c USB: s3c2410_udc: fix custom UDC command handling 2011-07-01 14:51:43 -07:00
s3c2410_udc.h
s3c-hsotg.c usb: gadget: convert all users to the new udc infrastructure 2011-06-28 11:13:35 -07:00
s3c-hsudc.c usb: gadget: add platform module alias where it is missing 2011-07-01 14:27:07 -07:00
serial.c usb: gadget: add max_speed to usb_composite_driver 2011-07-01 14:27:05 -07:00
storage_common.c usb: gadget: Compilation warning fix 2011-07-01 14:45:44 -07:00
u_audio.c usb: g_audio: Fix crash at driver removal 2010-12-03 12:05:35 -08:00
u_audio.h
u_ether.c usb: gadget: add SS descriptors to Ethernet gadget 2011-07-08 13:55:30 +03:00
u_ether.h usb: gadget: add usb_endpoint_descriptor to struct usb_ep 2011-06-28 11:14:36 -07:00
u_phonet.h
u_serial.c usb: gadget: add usb_endpoint_descriptor to struct usb_ep 2011-06-28 11:14:36 -07:00
u_serial.h usb: gadget: add usb_endpoint_descriptor to struct usb_ep 2011-06-28 11:14:36 -07:00
udc-core.c usb: gadget: udc-core: wire up sysfs files 2011-07-01 14:31:14 -07:00
usbstring.c
uvc_queue.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
uvc_queue.h
uvc_v4l2.c [media] v4l2-event/ctrls/fh: allocate events per fh and per type instead of just per-fh 2011-07-27 17:53:31 -03:00
uvc_video.c
uvc.h
webcam.c usb: gadget: add max_speed to usb_composite_driver 2011-07-01 14:27:05 -07:00
zero.c usb: gadget: zero: add superspeed support 2011-07-08 13:57:54 +03:00