commit | 6dc7e8764b0879157899aa9ca15f894e001f0c20 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Wed Dec 12 14:03:48 2018 -0800 |
committer | Olof Johansson <olof@lixom.net> | Wed Dec 12 14:03:48 2018 -0800 |
tree | 4e8876fecb8fe99abd95216200921042767576c9 | |
parent | 4238973b2ecd84412d78cc72c4ab3bdae064f2e8 [diff] | |
parent | e9e863dc1dc88212b09d279a143027e1521b35d1 [diff] |
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>