diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-13 12:50:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-13 12:50:48 -0700 |
commit | 79ec6d9cac46d59db9b006bc9cde2811ef365292 (patch) | |
tree | 90c985e59759c54ed871ac6568728b2f3648a0cf /MAINTAINERS | |
parent | 6ad4bf6ea1609fb539a62f10fca87ddbd53a0315 (diff) | |
parent | 45aefe3d2251e4e229d7662052739f96ad1d08d9 (diff) | |
download | linux-79ec6d9cac46d59db9b006bc9cde2811ef365292.tar.gz linux-79ec6d9cac46d59db9b006bc9cde2811ef365292.tar.bz2 linux-79ec6d9cac46d59db9b006bc9cde2811ef365292.zip |
Merge tag 'libata-5.10-2020-10-12' of git://git.kernel.dk/linux-block
Pull libata updates from Jens Axboe:
"Nothing major in here, just fixes or improvements collected over the
last few months"
* tag 'libata-5.10-2020-10-12' of git://git.kernel.dk/linux-block:
ata: ahci: mvebu: Make SATA PHY optional for Armada 3720
MAINTAINERS: remove LIBATA PATA DRIVERS entry
pata_cmd64x: Use fallthrough pseudo-keyword
ahci: qoriq: enable acpi support in qoriq ahci driver
sata, highbank: simplify the return expression of ahci_highbank_suspend
ahci: Add Intel Rocket Lake PCH-H RAID PCI IDs
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ba436ded0f1a..71291bb26a07 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9882,15 +9882,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git F: drivers/ata/pata_arasan_cf.c F: include/linux/pata_arasan_cf_data.h -LIBATA PATA DRIVERS -M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> -M: Jens Axboe <axboe@kernel.dk> -L: linux-ide@vger.kernel.org -S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git -F: drivers/ata/ata_generic.c -F: drivers/ata/pata_*.c - LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS M: Linus Walleij <linus.walleij@linaro.org> L: linux-ide@vger.kernel.org |