diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2021-08-12 22:36:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-08-12 22:36:56 +0200 |
| commit | 0dc76ecbbf15c43197f204c6631c6ef12f00d6ba (patch) | |
| tree | 208ef2b361b4ccdec2de963bfe6f40c09e8e65e8 /MAINTAINERS | |
| parent | Merge tag 'v5.14-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/drivers (diff) | |
| parent | Merge branch 'for-v5.15/omap-gpmc' into for-next (diff) | |
| download | linux-dev-0dc76ecbbf15c43197f204c6631c6ef12f00d6ba.tar.xz linux-dev-0dc76ecbbf15c43197f204c6631c6ef12f00d6ba.zip | |
Merge tag 'memory-controller-drv-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers
Memory controller drivers for v5.15
Few minor fixes: maintainer pattern, unused-function warning in
Tegra186 and suspend/resume in OMAP GPMC.
* tag 'memory-controller-drv-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
memory: omap-gpmc: Drop custom PM calls with cpu_pm notifier
memory: omap-gpmc: Clear GPMC_CS_CONFIG7 register on restore if unused
MAINTAINERS: update arm,pl353-smc.yaml reference
memory: tegra: fix unused-function warning
Link: https://lore.kernel.org/r/20210809152639.110576-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3a7fce893d7a..834aac836bc4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1488,7 +1488,7 @@ M: Miquel Raynal <miquel.raynal@bootlin.com@bootlin.com> M: Naga Sureshkumar Relli <nagasure@xilinx.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: Documentation/devicetree/bindings/mtd/arm,pl353-smc.yaml +F: Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml F: drivers/memory/pl353-smc.c ARM PRIMECELL CLCD PL110 DRIVER |