defconfig update

Conflicts:
	arch/arm/configs/d801_defconfig