summaryrefslogtreecommitdiff
path: root/net/hsr
diff options
context:
space:
mode:
Diffstat (limited to 'net/hsr')
0 files changed, 0 insertions, 0 deletions
t/?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
-next.git/diff/net/mac802154?h=nds-private-remove&id=69973b830859bc6529a7a0468ba0d80ee5117826&id2=2e4333c14de06a333783d6812cf3c4998f78b0c8'>diff)
Linux 4.9
Diffstat (limited to 'net/mac802154')