Merge branch 'master' of github.com:vakkasa/android_kernel_samsung_crespo