close to release

Conflicts:
	arch/arm/configs/cyanogenmod_acclaim_defconfig

Change-Id: I2583fd7651b3e48a2466925b7174c35105e249f2