Merge branch 'next' of git://github.com/CyanogenMod/android_kernel_samsung_d2 into cm-10.1

Conflicts:
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a3xx.c