NOF-V10

Conflicts:
	arch/arm/configs/cyanogenmod_acclaim_defconfig

Change-Id: Iab536a4bea8ca16234d351a3f8229f6d04a179d1