rebase modifications

Conflicts:
	block/Makefile
	boot.img
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c
	drivers/input/touchscreen/clearpad_core.c
	drivers/staging/prima/Makefile
	sound/soc/codecs/wcd9304.c
	zImage
delete mako files
makefile

Conflicts:
	Makefile
	boot.img
	zImage
makefile