another one
Merge branch 'master' of github.com:bikedude880/android_kernel_samsung_jfltevzw