diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-03-12 15:27:14 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-12 15:27:14 +0100 |
commit | fdda85f6969cadf4fda8c1eb15c1ac7ec8798bcd (patch) | |
tree | cbb17c3c986fbf84df25c0cd4d3e63d9e9d46ba3 /MAINTAINERS | |
parent | Merge tag 'at91-ab-4.17-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | Merge tag 'nand/pxa3xx-removal' of git://git.infradead.org/linux-mtd into pxa... (diff) | |
download | linux-fdda85f6969cadf4fda8c1eb15c1ac7ec8798bcd.tar.xz linux-fdda85f6969cadf4fda8c1eb15c1ac7ec8798bcd.zip |
Merge tag 'pxa-for-4.17' of https://github.com/rjarzmik/linux into next/soc
Pull "This is the pxa changes for v4.17 cycle" from Robert Jarzmik:
- minor changes for property API
- clock API fix for ULPI driver warning
It exceptionally contains a merge from the mtd tree from Boris
to prevent any merge conflicts in the PXA tree.
* tag 'pxa-for-4.17' of https://github.com/rjarzmik/linux:
ARM: pxa/raumfeld: use PROPERTY_ENTRY_U32() directly
ARM: pxa: ulpi: fix ulpi timeout and slowpath warn
ARM: pxa: cm-x300: remove inline directive
ARM: pxa: fix static checker warning in pxa3xx-ulpi
MAINTAINERS: remove entry for deleted pxa3xx_nand driver
arm: dts: pxa: use reworked NAND controller driver
dt-bindings: mtd: remove pxa3xx NAND controller documentation
mtd: nand: remove useless fields from pxa3xx NAND platform data
mtd: nand: remove deprecated pxa3xx_nand driver
mtd: nand: use Marvell reworked NAND controller driver with all platforms
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5accf0863142..cc5f70e746b4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11365,12 +11365,6 @@ F: include/sound/pxa2xx-lib.h F: sound/arm/pxa* F: sound/soc/pxa/ -PXA3xx NAND FLASH DRIVER -M: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> -L: linux-mtd@lists.infradead.org -S: Maintained -F: drivers/mtd/nand/pxa3xx_nand.c - QAT DRIVER M: Giovanni Cabiddu <giovanni.cabiddu@intel.com> L: qat-linux@intel.com |