Fixed some merge conflitcts and removed un-uneeded files. Also, Linux 3.4.10 patch
Merge branch 'htc-jb_42_vf89' of github.com:Joelz9614/android_422_kernel_htc_monarudo into htc-jb_42_vf89
Fix missing file