ok this should be right now

Change-Id: Ia5b11b1986f0ba2e727bb842a6f717510df249d5
Merge branch 'cm-10.1_3.4' of git://github.com/x0xhellx0x/android_kernel_samsung_d2 into cm-10.1_3.4

Conflicts:
	arch/arm/configs/cyanogen_d2spr_defconfig

Change-Id: Ic31dc942146b39addc9dcaf997a4fe8e07cdf445