diff options
| author | Olof Johansson <olof@lixom.net> | 2019-07-15 17:29:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-07-15 17:29:45 -0700 |
| commit | 7cba7caceebc0c17acd4165db313575f8c0f5387 (patch) | |
| tree | 45089fed8b6939a3993dcf4c13857b46a0d0bba1 /MAINTAINERS | |
| parent | da4d0b289142208893f6e685b0bc279fb3173478 (diff) | |
| parent | 1f6db18fbd764ea3079eba289652b622f9c8c5ef (diff) | |
| download | linux-7cba7caceebc0c17acd4165db313575f8c0f5387.tar.bz2 | |
Merge branch 'for-arm-soc' of git://git.armlinux.org.uk/~rmk/linux-arm into arm/soc
* 'for-arm-soc' of git://git.armlinux.org.uk/~rmk/linux-arm: (21 commits)
ARM: sa1100: convert to common clock framework
ARM: riscpc: enable chained scatterlist support
ARM: riscpc: reduce IRQ handling code
ARM: riscpc: move RiscPC assembly files from arch/arm/lib to mach-rpc
ARM: riscpc: parse video information from tagged list
ARM: riscpc: add ecard quirk for Atomwide 3port serial card
ARM: sa1100/neponset: convert serial to use gpiod APIs
ARM: sa1100/hackkit: remove empty serial mctrl functions
ARM: sa1100/badge4: remove commented out modem control initialisers
ARM: sa1100/h3xxx: convert serial to gpiod APIs
ARM: sa1100/assabet: convert serial to gpiod APIs
serial: sa1100: add note about modem control signals
serial: sa1100: add support for mctrl gpios
ARM: riscpc: dma: use __iomem pointers for writing DMA
ARM: riscpc: dma: improve address/length writing
ARM: riscpc: dma: make state a local variable
ARM: riscpc: dma: eliminate "cur_sg" scatterlist usage
ARM: riscpc: fix DMA
ARM: riscpc: fix ecard printing
ARM: riscpc: fix lack of keyboard interrupts after irq conversion
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ba64522eed37..1f1164b76952 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1231,7 +1231,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 |