Merge tag 'amlogic-fixes-v5.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 5 Jun 2021 22:39:22 +0000 (15:39 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 5 Jun 2021 22:39:23 +0000 (15:39 -0700)
commit3091a9e74240e296cbf657bb7ff6bdb7c33720f0
treeb3c1ef38bbee57bbae30cb8a96d52ed018c563a1
parent3a2d3ae06787893138bfb2c3abf5dbc40a76f23d
parent4cce442ffe5448ef572adc8b3abe7001b398e709
Merge tag 'amlogic-fixes-v5.13-rc1' of https://git./linux/kernel/git/amlogic/linux into arm/fixes

Amlogic fixes for v5.13-rc1
- arm64: meson: select COMMON_CLK to select a proper implementation of the clock API
- soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe()

* tag 'amlogic-fixes-v5.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: meson: select COMMON_CLK
  soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe()

Link: https://lore.kernel.org/r/73e76706-f3f4-bebf-10dd-d2ec9106a234@baylibre.com
Signed-off-by: Olof Johansson <olof@lixom.net>