sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'amlogic-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc

Browse Source 
soc: Amlogic updates for v4.21
- ARM: meson: Kconfig: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER
- misc MAINTAINERS updates

* tag 'amlogic-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: meson: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER
  MAINTAINERS: add drivers/soc/amlogic/ to amlogic list
  MAINTAINERS: Remove myself from the list

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2018-12-12 14:03:48 -08:00
parent 4238973b2e e9e863dc1d
commit 6dc7e8764b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@@ -1296,7 +1296,6 @@ F: include/dt-bindings/clock/gxbb*
F: Documentation/devicetree/bindings/clock/amlogic*
ARM/Amlogic Meson SoC support
M: Carlo Caione <carlo@caione.org>
M: Kevin Hilman <khilman@baylibre.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-amlogic@lists.infradead.org
@@ -1307,6 +1306,7 @@ F: arch/arm/boot/dts/meson*
F: arch/arm64/boot/dts/amlogic/
F: drivers/pinctrl/meson/
F: drivers/mmc/host/meson*
F: drivers/soc/amlogic/
N: meson
ARM/Annapurna Labs ALPINE ARCHITECTURE