Merge tag 'tee-menu-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 5 May 2022 13:48:31 +0000 (15:48 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 5 May 2022 13:48:33 +0000 (15:48 +0200)
Combine TEE config and menu in one line

* tag 'tee-menu-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: combine "config" and "menu" for TEE's menuconfig

Link: https://lore.kernel.org/r/20220503191626.GA3278203@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge