The dts Makefile has a bunch of nasty conflicts, attempt to resolve
these now to avoid trouble later.

Conflicts:
	arch/arm/boot/dts/Makefile
Signed-off-by: NArnd Bergmann <arnd@arndb.de>