diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-11-21 12:27:39 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-11-21 12:27:40 +0100 |
| commit | b8d0b1bef204037567b5eefae3270747577c3554 (patch) | |
| tree | a6d98d14533ce17975f7d67ef90f5e4b71d78fbc /MAINTAINERS | |
| parent | 566fb6711f186803c9b078f35fc1eb9169541ef0 (diff) | |
| parent | dc6e328a8d28e1c0c6e4f19e90cca17bb8fc126b (diff) | |
Merge tag 'ixp4xx-for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/soc
IXP4xx patches for v6.2:
- Dropped the final static mappings.
- Fixed some errors in the MAINTAINERS file.
* tag 'ixp4xx-for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: ixp4xx: Remove unused static map
MAINTAINERS: adjust ARM/INTEL IXP4XX ARM ARCHITECTURE to ixp4xx clean-up
Link: https://lore.kernel.org/r/CACRpkdYNwyZ1FDM07MkUfYyYGtXFQfy1xP9Utc5+K2+gn_ZW9g@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e04d944005ba..e4556ee0408c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2272,8 +2272,6 @@ F: drivers/clocksource/timer-ixp4xx.c F: drivers/crypto/ixp4xx_crypto.c F: drivers/gpio/gpio-ixp4xx.c F: drivers/irqchip/irq-ixp4xx.c -F: include/linux/irqchip/irq-ixp4xx.h -F: include/linux/platform_data/timer-ixp4xx.h ARM/INTEL KEEMBAY ARCHITECTURE M: Paul J. Murphy <paul.j.murphy@intel.com> |