diff options
| author | Linus Torvalds <[email protected]> | 2017-08-13 19:41:58 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-08-13 19:41:58 +0000 |
| commit | ce7ba95cf078337c9921b301a7e4b9e82561db38 (patch) | |
| tree | 3c888fee60a931ca658218adc58bc12df4864c37 /drivers/iio/trigger/stm32-timer-trigger.c | |
| parent | Merge tag 'tty-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff) | |
| parent | thunderbolt: Do not enumerate more ports from DROM than the controller has (diff) | |
| download | kernel-ce7ba95cf078337c9921b301a7e4b9e82561db38.tar.gz kernel-ce7ba95cf078337c9921b301a7e4b9e82561db38.zip | |
Merge tag 'char-misc-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fixes from Greg KH:
"Here are two patches for 4.13-rc5.
One is a fix for a reported thunderbolt issue, and the other a fix for
an MEI driver issue. Both have been in linux-next with no reported
issues"
* tag 'char-misc-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
thunderbolt: Do not enumerate more ports from DROM than the controller has
mei: exclude device from suspend direct complete optimization
Diffstat (limited to 'drivers/iio/trigger/stm32-timer-trigger.c')
0 files changed, 0 insertions, 0 deletions