Samsung source update
Merge branch 'master' of https://github.com/Rox-/android_kernel_samsung_s3ve3g