summaryrefslogtreecommitdiff
path: root/drivers/usb/serial/option.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial/option.c')
0 files changed, 0 insertions, 0 deletions
p;id=92549cdc288f47f3a98cf80ac5890c91f5876a06'>92549cdc288f47f3a98cf80ac5890c91f5876a06 (diff)parent03c902bff524e0cf664737a33f2365f7837040bf (diff)
Merge tag 'iwlwifi-for-kalle-2017-01-23' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
* Remove an extra hyphen from a string that was preventing the firmware to load * Avoid a crash when the firmware is restarted in certain scenarios with DQA
Diffstat (limited to 'drivers')