From: Olof Johansson Date: Tue, 25 Sep 2018 20:33:02 +0000 (-0700) Subject: Merge tag 'at91-4.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux... X-Git-Tag: v4.20-rc1~63^2~16 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d7f59da42c25deafa91a1f2b22ffddfe24be8aa6;p=linux.git Merge tag 'at91-4.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into next/soc AT91 SoC for 4.20 - rename MAINTAINERS entries and change maintainers - two pm cleanups * tag 'at91-4.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: MAINTAINERS: sdhci: move the Microchip entry to proper location MAINTAINERS: move former ATMEL entries to proper MICROCHIP location MAINTAINERS: remove the / ATMEL string from MICROCHIP entries MAINTAINERS: iio: add co-maintainer to SAMA5D2-compatible ADC driver MAINTAINERS: pwm: add entry for Microchip pwm driver MAINTAINERS: dmaengine: add files to Microchip dma entry MAINTAINERS: USB: change maintainer for Microchip USBA gadget driver MAINTAINERS: ASoC: change maintainer for Microchip ALSA drivers MAINTAINERS: media: change Microchip ISI, ISC maintainers MAINTAINERS: update entry for Microchip NAND driver support MAINTAINERS: ARM: at91: add co-maintainer for ARM/Microchip ARM: at91: pm: call put_device instead of of_node_put in at91_pm_config_ws ARM: at91: pm: remove pm_bu initialization in at91_pm_backup_init() Signed-off-by: Olof Johansson --- d7f59da42c25deafa91a1f2b22ffddfe24be8aa6