merging code from abenagiel android_kernel_fih_msm7x30
merging code from abenagiel android_kernel_fih_msm7x30