diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:56 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:56 +0100 |
| commit | b76dbc19ecdad60742bd51fba34092a0c2d81dc6 (patch) | |
| tree | 853765b1f3e315e4057ed9efd3726efb93c76d70 /drivers/usb/gadget/udc-core.c | |
| parent | 611ee64d3560a082b41f74fc3921cbe42be951ba (diff) | |
| parent | 7c4deebb459fa66380f061727c4a8b8c5e3d6990 (diff) | |
Merge branch 'lsk-3.10-armlt-dma' into integration-lsk-3.10-juno-android
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'drivers/usb/gadget/udc-core.c')
0 files changed, 0 insertions, 0 deletions