aboutsummaryrefslogtreecommitdiff
path: root/kernel/dma/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2018-10-22 18:03:31 +0100
committerLinus Torvalds2018-10-22 18:03:31 +0100
commit13775dacca5c158a257320f4b47e1220b82e3b21 (patch)
tree5ce47e235ab61ef320f49a0cadac8f52f0beecb1 /kernel/dma/Makefile
parent6ab9e09238fdfd742fe23b81e2d385a1cab49d9b (diff)
parentb3cd92db6ecde0a1c3651771a23f45b708533de4 (diff)
Merge tag 'for-4.20/libata-20181021' of git://git.kernel.dk/linux-block
Pull libata updates from Jens Axboe: "Here are the libata changes queued up for 4.20: - %pOFn device_node.name conversion (Rob Herring) - Use LBAM/LBAH password defines instead of hardcoding (Linus Walleij) - Series adding support for the allwinner R40 AHCI controller (Corentin Labbe) - Disable ALPM for Ampere Computing device (Suman Tripathi) - ahci bcrm fixes (Florian Fainelli) - Redundant Kconfig defaults (Bartlomiej Zolnierkiewicz) - Code cleanups (Nathan Chancellor)" * tag 'for-4.20/libata-20181021' of git://git.kernel.dk/linux-block: ata: remove redundant 'default n' from Kconfig ata: ep93xx: Use proper enums for directions ata: ahci_brcm: Allow using driver or DSL SoCs ata: ahci_brcm: Match BCM63138 compatible strings ata: ahci_brcm: Allow optional reset controller to be used dt-bindings: ata: Document BCM63138 compatible string pata_atiixp: Remove unnecessary parentheses ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA dt-bindings: ata: update ahci_sunxi bindings ata: ahci_sunxi: add support for r40 dt-bindings: ata: ahci-platform: document phy-supply ata: ahci_platform: add support for PHY controller regulator dt-bindings: ata: ahci-platform: document ahci-supply ata: ahci_platform: add support for AHCI controller regulator dt-bindings: ata: ahci-platform: fix indentation of target-supply libata: Use SMART LBAM/LBAH password defines ata: ahci: Convert to using %pOFn instead of device_node.name
Diffstat (limited to 'kernel/dma/Makefile')
0 files changed, 0 insertions, 0 deletions