diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-19 14:29:08 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-19 14:29:08 -0700 |
| commit | f97bd9e5fccad66301a486309aba96e4188a9310 (patch) | |
| tree | 1b21dead6a8e3c230bc1342e1e50070d2a534567 /drivers/usb/class/cdc-wdm.c | |
| parent | ff3b6278edacc846fa63191f9f7ba10171160f61 (diff) | |
| parent | 867f900b43f8d571962b4a47035a0af9ebf84461 (diff) | |
Merge branch 'v3.18/topic/coresight' into linux-linaro-lsk-v3.18
* v3.18/topic/coresight:
ARM: Kconfig.debug: OC_ETM and CORESIGHT are mutually exclusive
Diffstat (limited to 'drivers/usb/class/cdc-wdm.c')
0 files changed, 0 insertions, 0 deletions