cleanup
Merge branch 'master' of github.com:MajorMonodon/android_kernel_sony_taoshan