Fix some more errors

Change-Id: I0ae5609f82e7a577f72f28688016222d8c705f57
Merge branch 'msm-3.4' of https://github.com/TeamPlaceholder/android_kernel_lge_gee into msm-3.4
Fix more errors, add fs from our cm-10.2 branch based on jb_2.6

Change-Id: Iff098789ad541212a2b72bf2dbac67585e07d3a6
Merge branch 'msm-3.4' of https://github.com/TeamPlaceholder/android_kernel_lge_gee into msm-3.4