diff options
author | Wolfgang Denk <wd@denx.de> | 2010-03-21 22:45:36 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-03-21 22:45:36 +0100 |
commit | b46b353b901a45ebe860f8bf874ca99f018cd410 (patch) | |
tree | e2d42c0f36b9d7b67c1a17fe97f4734552370a6b /drivers/usb/gadget | |
parent | 3c950e2ebfde083084cc926b020e3a22a536bf85 (diff) | |
parent | daa989b47297c9f73426783599c286ef3a1f3f49 (diff) | |
download | u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.zip u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.gz u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.bz2 |
Merge remote branch 'origin/master' into next
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--[-rwxr-xr-x] | drivers/usb/gadget/Makefile | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | drivers/usb/gadget/spr_udc.c | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 1d7362d..1d7362d 100755..100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile diff --git a/drivers/usb/gadget/spr_udc.c b/drivers/usb/gadget/spr_udc.c index f2b06d6..f2b06d6 100755..100644 --- a/drivers/usb/gadget/spr_udc.c +++ b/drivers/usb/gadget/spr_udc.c |