Pump play to V2.3

Conflicts:
	arch/arm/configs/cyanogenmod_x3_defconfig