diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-19 10:56:53 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-19 10:56:53 +0800 |
| commit | c67d235857a13b609e664f901fb990f49796ddcc (patch) | |
| tree | 70b1a66bfb9aa309d901e203f1a962d2510e685f /drivers/usb/host/xhci-hub.c | |
| parent | fe522b1745154e8889a04b87e76d53ccece41d4a (diff) | |
| parent | 3cab355c2ff3a781b6ebe9d1a25bd4ebc1207430 (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18
Conflicts:
include 666eeee7c4ff3 include/linux/irq.h
which used for pcie support
Diffstat (limited to 'drivers/usb/host/xhci-hub.c')
0 files changed, 0 insertions, 0 deletions