msm8974-gpu: fix OC merge conflicts

Change-Id: I75491c89b9195cd00577ee9de70e45eac047a695
added GPU O/C freq 487.5MHz

Conflicts:
	arch/arm/boot/dts/msm8974-gpu.dtsi
dts: add 389MHz GPU frequency scaling step

Change-Id: I2ce9664c5986e863a24f9329e2e1140c22465300
GPU: fix amount of scaling steps to allow 600MHz OC

Change-Id: I1dcf312560876e54de2f9e3122f1ad2fe551ce61
FS: import F2FS

Signed-off-by: Paul Reioux <reioux@gmail.com>