diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-05 15:31:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-05 15:31:14 -0700 |
| commit | e543c8a92fb6eca8dd554561fa55bba5f2a90d09 (patch) | |
| tree | 4fab9e38a6f1a48c256cf1bf3242d9f40202e1ae /include/media/vsp1.h | |
| parent | 112eb07287d10bef6ec74e36f1ffd24f19bdd0a0 (diff) | |
| parent | f7cf69ae171592d133c69b9adaa5de7cfb6038ea (diff) | |
Merge branch 'for-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
- Revert of sata_mv devm_ioremap_resource() conversion. It made init
fail if there are overlapping resources which led to detection
failures on some setups.
- A workaround for an Acer laptop which sometimes reports corrupt port
map.
- Other non-critical fixes.
* 'for-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
libata: fix error checking in in ata_parse_force_one()
Revert "ata: sata_mv: Convert to devm_ioremap_resource()"
ata: libahci: properly propagate return value of platform_get_irq()
ata: sata_rcar: Handle return value of clk_prepare_enable
ahci: Acer SA5-271 SSD Not Detected Fix
Diffstat (limited to 'include/media/vsp1.h')
0 files changed, 0 insertions, 0 deletions