summaryrefslogtreecommitdiff
path: root/net/irda
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2017-01-24 14:27:53 +0200
committerKalle Valo <kvalo@codeaurora.org>2017-01-24 14:27:53 +0200
commitbd19b5ab1da654de456e102250822ec06311d6ad (patch)
tree1a882bcf6f280aff6a263198782ff3e647fd5c42 /net/irda
parent92549cdc288f47f3a98cf80ac5890c91f5876a06 (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 'net/irda')
0 files changed, 0 insertions, 0 deletions
v class='commit-subject'>Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe: "A single fix that should go into 4.10, fixing a regression on some devices with the WRITE_SAME command" * 'for-linus' of git://git.kernel.dk/linux-block: block: don't try Write Same from __blkdev_issue_zeroout
Diffstat (limited to 'tools/usb/ffs-aio-example')