diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-12 18:19:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-12 18:19:53 +0000 |
| commit | c7da7ad00ab7ff435d83fe5c85cdb90851e94928 (patch) | |
| tree | a0fa0090bc87b8118434f12b12bd8b1d0f728e3f /include/linux/pm_domain.h | |
| parent | 7d750bffa1f89886df536641880b8fa0cd15c981 (diff) | |
| parent | 1aa8c51d1c90b00e42ee053120a4c05227b4af24 (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/dwc3' into linux-linaro-lsk-v3.14
Conflicts:
drivers/usb/dwc3/core.c
drivers/usb/dwc3/gadget.c
Diffstat (limited to 'include/linux/pm_domain.h')
0 files changed, 0 insertions, 0 deletions