update topology

Conflicts:
	arch/arm/kernel/topology.c