[PATCH] powerpc: merge atomic.h, memory.h