Andrew,
	Here are a couple of cleanups for the 2.5.38-mm2 tree.

Anton,
	I cc'd you, because the patch also moves the __cpu_to_node() function 
from mmzone.h into topology.h, where it really belongs (as long as the 
in-kernel topology stuff is there).  If there's some reason that 
shouldn't be done, please yell at me! ;)

Changelog:
	This patch cleans up a couple of braindamaged things I was doing with 
<asm-generic/topology.h> and moves a ppc64 topology function from 
mmzone.h into topology.h.

Cheers!

-Matt