]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
Merge tag 'sunxi-core-for-5.14-1' of https://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 12 Jun 2021 15:54:01 +0000 (08:54 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 12 Jun 2021 15:54:03 +0000 (08:54 -0700)
One patch to select one of our timer in the arm64 Kconfig option.

* tag 'sunxi-core-for-5.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: sunxi: Build the sun4i timer driver

Link: https://lore.kernel.org/r/bf3431f6-2196-425c-9b43-0bf4de0b6d30.lettre@localhost
Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge