diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-04 14:30:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-04 14:30:31 -0700 |
| commit | 612341bda6ada2bfb2f606e0ce894fca5b6468d9 (patch) | |
| tree | 47b1c24cf79816898ce4cddac93ea6b96235d3fc /MAINTAINERS | |
| parent | c9946d014fe8da95257a118ba946bd4bd44a0c86 (diff) | |
| parent | ff9e0e3b091291a6694c52074940c5fabd693467 (diff) | |
Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull non-urgent ARM SoC fixes from Arnd Bergmann:
"Smaller patches that didn't seem to find a home in other branches, and
low-priority fixes from late in the merge window.
- Lee Jones retires as bcm2835 (raspberry pi) co-maintainer.
- a couple of bugfixes for the ARM CCN bus driver that were regarded
not important enough
- minor device tree fixes for the Renesas and Marvell platforms, that
came a little late or did not justify have another pull request
after the last -rc"
* tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
bus: arm-ccn: Enable stats for CCN-502 interconnect
dt-bindings: arm-ccn: Add bindings info for CCN-502 compatible string
bus: arm-ccn: Use devm_kcalloc() in arm_ccn_probe()
bus: arm-ccn: Fix module autoload
MAINTAINERS: add RV1108 Rockchip soc to maintained files
ARM: dts: kirkwood: Fix Openblock A6 nand partition overlap
ARM: dts: armadillo800eva: Split LCD mux and gpio
MAINTAINERS: Remove Lee Jones from bcm2835.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1f949b5a39d3..b5a5ef1f5000 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1714,6 +1714,7 @@ L: linux-rockchip@lists.infradead.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git S: Maintained F: arch/arm/boot/dts/rk3* +F: arch/arm/boot/dts/rv1108* F: arch/arm/mach-rockchip/ F: drivers/clk/rockchip/ F: drivers/i2c/busses/i2c-rk3x.c @@ -2696,7 +2697,6 @@ N: kona F: arch/arm/mach-bcm/ BROADCOM BCM2835 ARM ARCHITECTURE -M: Lee Jones <lee@kernel.org> M: Eric Anholt <eric@anholt.net> M: Stefan Wahren <stefan.wahren@i2se.com> L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) |