Merge branch 'arm64-for-4.21' into arm64-for-4.21-3
authorAndy Gross <andy.gross@linaro.org>
Fri, 30 Nov 2018 01:25:42 +0000 (19:25 -0600)
committerAndy Gross <andy.gross@linaro.org>
Fri, 30 Nov 2018 01:25:42 +0000 (19:25 -0600)

Trivial merge