diff options
author | Olof Johansson <olof@lixom.net> | 2018-12-12 23:03:48 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-12-12 23:03:48 +0100 |
commit | 6dc7e8764b0879157899aa9ca15f894e001f0c20 (patch) | |
tree | 4e8876fecb8fe99abd95216200921042767576c9 /fs/iomap.c | |
parent | Merge tag 'omap-for-v4.21/omap1-signed' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | ARM: meson: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER (diff) | |
download | linux-6dc7e8764b0879157899aa9ca15f894e001f0c20.tar.xz linux-6dc7e8764b0879157899aa9ca15f894e001f0c20.zip |
Merge tag 'amlogic-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc
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>
Diffstat (limited to 'fs/iomap.c')
0 files changed, 0 insertions, 0 deletions