am 0cfdb4e9: am 47e27a4f: Merge "core: combo: arm: use appropriate mcpu flags...
am 0cfdb4e9: am 47e27a4f: Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
* commit '0cfdb4e9':
core: combo: arm: use appropriate mcpu flags for cortex-a7