diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-03 09:30:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-03 09:30:00 -0700 |
| commit | c1de1591d927bc1e55095d642b3c3cc2e54fc1cd (patch) | |
| tree | 4386f6b63b65ff799cd1b1ec9a84990a357bb117 /drivers/ata/pata_triflex.c | |
| parent | 887c8ba753fbe809ba93fa3cfd0cc46db18d37d4 (diff) | |
| parent | d312fefea8387503375f728855c9a62de20c9665 (diff) | |
Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"Nothing too interesting.
Arnd's gcc-7 warning fixes that slipped through the cracks for two
release cycles (my bad), and two minor low level driver updates"
* 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ahci: don't ignore result code of ahci_reset_controller()
ata_piix: Add Fujitsu-Siemens Lifebook S6120 to short cable IDs
ata: avoid gcc-7 warning in ata_timing_quantize
Diffstat (limited to 'drivers/ata/pata_triflex.c')
0 files changed, 0 insertions, 0 deletions