tmp_suning_uos_patched/drivers/usb/gadget
Linus Torvalds 63a93699c6 Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6629/2: aaec2000: remove support for mach-aaec2000
  ARM: lh7a40x: remove unmaintained platform support

Fix up trivial conflicts in
 - arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed)
 - drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)
2011-03-16 19:05:40 -07:00
..
amd5536udc.c
amd5536udc.h
at91_udc.c
at91_udc.h
atmel_usba_udc.c
atmel_usba_udc.h
audio.c
cdc2.c
ci13xxx_msm.c
ci13xxx_pci.c
ci13xxx_udc.c
ci13xxx_udc.h
composite.c
config.c
dbgp.c
dummy_hcd.c
epautoconf.c
ether.c
f_acm.c
f_audio.c
f_ecm.c
f_eem.c
f_fs.c
f_hid.c
f_loopback.c
f_mass_storage.c
f_ncm.c
f_obex.c
f_phonet.c
f_rndis.c
f_serial.c
f_sourcesink.c
f_subset.c
f_uvc.c
f_uvc.h
file_storage.c
fsl_mxc_udc.c
fsl_qe_udc.c
fsl_qe_udc.h
fsl_udc_core.c
fsl_usb2_udc.h
fusb300_udc.c
fusb300_udc.h
g_ffs.c
g_zero.h
gadget_chips.h
gmidi.c
goku_udc.c
goku_udc.h
hid.c
imx_udc.c
imx_udc.h
inode.c
Kconfig
langwell_udc.c
langwell_udc.h
m66592-udc.c
m66592-udc.h
Makefile
mass_storage.c
multi.c
mv_udc_core.c
mv_udc_phy.c
mv_udc.h
ncm.c
ndis.h
net2280.c
net2280.h
nokia.c
omap_udc.c
omap_udc.h
pch_udc.c
printer.c
pxa25x_udc.c
pxa25x_udc.h
pxa27x_udc.c
pxa27x_udc.h
r8a66597-udc.c
r8a66597-udc.h
rndis.c
rndis.h
s3c2410_udc.c
s3c2410_udc.h
s3c-hsotg.c
serial.c
storage_common.c
u_audio.c
u_audio.h
u_ether.c
u_ether.h
u_phonet.h
u_serial.c
u_serial.h
usbstring.c
uvc_queue.c
uvc_queue.h
uvc_v4l2.c
uvc_video.c
uvc.h
webcam.c
zero.c