diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-03 11:44:46 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-03 11:44:46 +0100 |
| commit | 1f6db18fbd764ea3079eba289652b622f9c8c5ef (patch) | |
| tree | 7483de89a7684b33634190220c15abc3dcf42039 /MAINTAINERS | |
| parent | d6c8204659eb1846c444997ee28fe9d7e5442f4e (diff) | |
| parent | 0b40deeef6d94ac21f4cdee4b1cda94a69c54ff9 (diff) | |
Merge branch 'sa1100-for-next'; commit 'riscpc^{/ARM: riscpc: enable chained scatterlist support}' into for-arm-soc
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 429c6c624861..bff3200f0e82 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1229,7 +1229,7 @@ F: include/uapi/drm/panfrost_drm.h ARM MFM AND FLOPPY DRIVERS M: Ian Molton <spyro@f2s.com> S: Maintained -F: arch/arm/lib/floppydma.S +F: arch/arm/mach-rpc/floppydma.S F: arch/arm/include/asm/floppy.h ARM PMU PROFILING AND DEBUGGING |