merge 91237d1f57093e8870967d6ff0390b6cf7714fed from CyanogenMod/android_kernel_htc_m7 includes updated iommu/msm_bus