Merge branch 'for-next/usb-gadget'
Conflicts:
	commands/Makefile
	common/Kconfig
	common/Makefile
	drivers/usb/gadget/dfu.c
commit 7782c08047fc44874caf1c03c153a070f9ac557a
2 parents 038be0f + 46ff98b
@Sascha Hauer Sascha Hauer authored on 7 Aug 2014
Showing 43 changed files
View
Documentation/user/usb.rst
View
commands/Kconfig
View
commands/Makefile
View
commands/dfu.c
View
commands/usbgadget.c 0 → 100644
View
commands/usbserial.c
View
common/Kconfig
View
common/Makefile
View
common/file-list.c 0 → 100644
View
common/version.c
View
drivers/usb/core/Makefile
View
drivers/usb/core/common.c 0 → 100644
View
drivers/usb/core/usb.c
View
drivers/usb/gadget/Kconfig
View
drivers/usb/gadget/Makefile
View
drivers/usb/gadget/at91_udc.c
View
drivers/usb/gadget/composite.c
Too large (Show diff)
View
drivers/usb/gadget/config.c
View
drivers/usb/gadget/dfu.c
View
drivers/usb/gadget/epautoconf.c
View
drivers/usb/gadget/f_acm.c
View
drivers/usb/gadget/f_fastboot.c 0 → 100644
View
drivers/usb/gadget/f_serial.c
View
drivers/usb/gadget/fsl_udc.c
View
drivers/usb/gadget/functions.c 0 → 100644
View
drivers/usb/gadget/gadget_chips.h
View
drivers/usb/gadget/multi.c 0 → 100644
View
drivers/usb/gadget/pxa27x_udc.c
View
drivers/usb/gadget/serial.c
View
drivers/usb/gadget/u_serial.c
View
drivers/usb/gadget/u_serial.h
View
drivers/usb/gadget/udc-core.c 0 → 100644
View
include/common.h
View
include/file-list.h 0 → 100644
View
include/param.h
View
include/usb/ch9.h
View
include/usb/composite.h
View
include/usb/dfu.h
View
include/usb/fastboot.h 0 → 100644
View
include/usb/gadget-multi.h 0 → 100644
View
include/usb/gadget.h
View
include/usb/usbserial.h
View
lib/parameter.c