more fixes
Merge branch 'master' of https://github.com/bilalliberty/android_kernel_htc_villec2-3.4