tree 151afc0add7828828b11d4725a33c1ef8a55c47e
parent 106f1ce29f1fa7ad18e47823789c176df57d75ee
parent a0121477d2c5e7b62436edca6dac4cd8058c15a5
author Kevin Hilman <khilman@linaro.org> 1431991096 -0700
committer Kevin Hilman <khilman@linaro.org> 1431991096 -0700

Merge branch 'v3.10/topic/arm64-errata' into linux-linaro-lsk-v3.10

* v3.10/topic/arm64-errata:
  arm64: errata: add workaround for cortex-a53 erratum #845719
  arm64: Remove unused cpu_name ascii in arch/arm64/mm/proc.S