fixing depr merge

Conflicts:

	arch/arm/configs/t0_04_defconfig