Merge "arm64: dts: txlx: add the attestationkeybox of unifykey" into amlogic-4.9-dev
authorBo Yang <bo.yang@amlogic.com>
Fri, 29 Jun 2018 07:15:28 +0000 (00:15 -0700)
committerGerrit Code Review <gituser@git.myamlogic.com>
Fri, 29 Jun 2018 07:15:28 +0000 (00:15 -0700)

Trivial merge