[meta-freescale] linux-fslc merge 'v4.9.105' into imx_4.9.x_2.0.0_ga

[Johannes Pointner]

Hello,

I just noticed that something went wrong during the merge of tag
'v4.9.105' into imx_4.9.x_2.0.0_ga (commit id
83174b99b192ce8b1f1bef0dcfd700c6f6b1a1b9).
If you take a look a the file arch/arm/include/asm/kvm_mmu.h it has
after the merge the same content as arch/arm64/include/asm/kvm_mmu.h