Conflicts:
	arch/arm/configs/imx_v6_v7_defconfig

Resolves one conflict with an earlier branch
Signed-off-by: Arnd Bergmann <arnd@arndb.de>