diff options
Diffstat (limited to 'net/mac80211/aes_cmac.c')
| mode: | |
 |
index : net-next.git | |
| net-next plumbings | Tobias Klauser |
| summaryrefslogtreecommitdiff |
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 16:18:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 16:18:51 -0800 |
| commit | a0a28644c1cf191e514dd64bf438e69c178b8440 (patch) | |
| tree | 4a5140d2f13692f91ca012d0eab146e9f366ce95 /drivers/usb/phy/phy-fsl-usb.c | |
| parent | a49e6f584e29785f9e5eb8dd31435746818dd5c4 (diff) | |
| parent | 6f3e71c0c3f2479e05682e2e563b75decab36591 (diff) | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fix from James Bottomley:
"A single fix this time: a fix for a virtqueue removal bug which only
appears to affect S390, but which results in the queue hanging forever
thus causing the machine to fail shutdown"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: virtio_scsi: Reject commands when virtqueue is broken
Diffstat (limited to 'drivers/usb/phy/phy-fsl-usb.c')